[mapserver-commits] r7864 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2008-08-17 19:44:34 -0400 (Sun, 17 Aug 2008)
New Revision: 7864

Modified:
   trunk/mapserver/maplexer.l
Log:
Fixed a memory leak associated with not deleting the lexer buffer before parsing certain types of strings. (bug 2729)

Modified: trunk/mapserver/maplexer.l
===================================================================
--- trunk/mapserver/maplexer.l	2008-08-17 22:27:39 UTC (rev 7863)
+++ trunk/mapserver/maplexer.l	2008-08-17 23:44:34 UTC (rev 7864)
@@ -65,9 +65,10 @@
          break;
        case(MS_TOKENIZE_STRING):
          BEGIN(INITIAL);
+         msyy_delete_buffer(YY_CURRENT_BUFFER);
+         msyy_scan_string(msyystring);
          msyysource=MS_STRING_TOKENS;
          msyystate=MS_TOKENIZE_DEFAULT;
-         msyy_scan_string(msyystring);
          msyyin=NULL;
          msyyreturncomments=0;
          include_stack_ptr=0;
@@ -75,6 +76,7 @@
          break;
        case(MS_TOKENIZE_URL_VARIABLE):
          BEGIN(URL_VARIABLE);
+         msyy_delete_buffer(YY_CURRENT_BUFFER);
          msyy_scan_string(msyystring);
          msyysource=MS_URL_TOKENS;
          msyystate=MS_TOKENIZE_DEFAULT;
@@ -83,9 +85,10 @@
          break;
        case(MS_TOKENIZE_URL_STRING):
          BEGIN(URL_STRING);
+         msyy_delete_buffer(YY_CURRENT_BUFFER);
+         msyy_scan_string(msyystring);
          msyysource=MS_URL_TOKENS;
          msyystate=MS_TOKENIZE_DEFAULT;
-         msyy_scan_string(msyystring);
          msyyin=NULL;
          msyyreturncomments=0; 
          return(0);