[mapserver-commits] r9282 - trunk/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2009-08-31 10:14:00 -0400 (Mon, 31 Aug 2009)
New Revision: 9282

Modified:
   trunk/mapserver/mapfile.c
Log:
Fixed msApplyDefaultSubstitutions causing the process to hang in an infinite loop (related to #3108)

Modified: trunk/mapserver/mapfile.c
===================================================================
--- trunk/mapserver/mapfile.c	2009-08-28 21:36:25 UTC (rev 9281)
+++ trunk/mapserver/mapfile.c	2009-08-31 14:14:00 UTC (rev 9282)
@@ -5413,12 +5413,11 @@
         sprintf(tmpstr,"%%%s%%", &(defaultkey[8]));
 
         msLayerSubstituteString(layer,tmpstr,msLookupHashTable(&(layer->metadata),defaultkey));
-        defaultkey = msNextKeyFromHashTable(&(layer->metadata),defaultkey);
         free(tmpstr);
       }
+      defaultkey = msNextKeyFromHashTable(&(layer->metadata),defaultkey);
     }
   }
-
 }
 
 /*