[mapserver-commits] r12786 - in branches/branch-6-0/mapserver: . mapscript/php

[svn at osgeo.org]

Author: aboudreault
Date: 2011-11-17 09:42:42 -0800 (Thu, 17 Nov 2011)
New Revision: 12786

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

Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2011-11-17 17:40:01 UTC (rev 12785)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2011-11-17 17:42:42 UTC (rev 12786)
@@ -14,6 +14,9 @@
 
 Current Version (future 6.0.2, SVN branch-6-0):
 ---------------------------
+
+- Fixed segfault when calling classObj::updateFromString() with SYMBOL (#4062)
+
 - fix rendering offset on thick GD lines (#3962)
 
 - fix segfault on join with postgresql tables (#4074)

Modified: branches/branch-6-0/mapserver/mapscript/php/mapscript_i.c
===================================================================
--- branches/branch-6-0/mapserver/mapscript/php/mapscript_i.c	2011-11-17 17:40:01 UTC (rev 12785)
+++ branches/branch-6-0/mapserver/mapscript/php/mapscript_i.c	2011-11-17 17:42:42 UTC (rev 12786)
@@ -792,6 +792,7 @@
     }
 
     layer->class[layer->numclasses]->type = layer->type;
+    layer->class[layer->numclasses]->layer = layer;
 
     layer->numclasses++;