[mapserver-commits] r10809 - trunk/mapserver

[svn at osgeo.org]

Author: aboudreault
Date: 2010-12-21 12:24:13 -0800 (Tue, 21 Dec 2010)
New Revision: 10809

Modified:
   trunk/mapserver/mapdraw.c
Log:
Fixed seg fault when a symbol name is read as an symbol index (not quoted)

Modified: trunk/mapserver/mapdraw.c
===================================================================
--- trunk/mapserver/mapdraw.c	2010-12-20 16:03:35 UTC (rev 10808)
+++ trunk/mapserver/mapdraw.c	2010-12-21 20:24:13 UTC (rev 10809)
@@ -1408,6 +1408,10 @@
   if(layer->class[c]->numstyles > 0 && layer->class[c]->styles[0] != NULL) {
       double maxsize,maxunscaledsize;
       styleObj *style = layer->class[c]->styles[0];
+      if (style->symbol >= map->symbolset.numsymbols) {
+          msSetError(MS_SYMERR, "Invalid symbol index: %d", "msDrawShape()", style->symbol);
+          return MS_FAILURE;
+      }
       symbolObj *symbol = map->symbolset.symbol[style->symbol];
       if(symbol->type == MS_SYMBOL_PIXMAP) {
     	  if(MS_SUCCESS != msPreloadImageSymbol(MS_MAP_RENDERER(map),symbol))