[mapserver-commits] r12785 - in trunk/mapserver: . mapscript/php

[svn at osgeo.org]

Author: aboudreault
Date: 2011-11-17 09:40:01 -0800 (Thu, 17 Nov 2011)
New Revision: 12785

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapscript/php/mapscript_i.c
Log:
Fixed segfault when calling classObj::updateFromString() with SYMBOL (#4062)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-11-17 14:57:59 UTC (rev 12784)
+++ trunk/mapserver/HISTORY.TXT	2011-11-17 17:40:01 UTC (rev 12785)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk, 6.1-dev, future 6.2): 
 -------------------------------------------------
 
+- Fixed segfault when calling classObj::updateFromString() with SYMBOL (#4062)
+
 - Use a renderer native follow text implementation if available.
 
 - Fixed layer with inline feature to support multiple classes (#4070)

Modified: trunk/mapserver/mapscript/php/mapscript_i.c
===================================================================
--- trunk/mapserver/mapscript/php/mapscript_i.c	2011-11-17 14:57:59 UTC (rev 12784)
+++ trunk/mapserver/mapscript/php/mapscript_i.c	2011-11-17 17:40:01 UTC (rev 12785)
@@ -792,6 +792,7 @@
     }
 
     layer->class[layer->numclasses]->type = layer->type;
+    layer->class[layer->numclasses]->layer = layer;
 
     layer->numclasses++;