[mapserver-commits] r7691 - trunk/mapserver

[svn at osgeo.org]

Author: Assefa
Date: 2008-06-18 14:07:15 -0400 (Wed, 18 Jun 2008)
New Revision: 7691

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapstring.c
Log:
possible buffer overflow in msGetPath (#2649)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-06-18 13:56:15 UTC (rev 7690)
+++ trunk/mapserver/HISTORY.TXT	2008-06-18 18:07:15 UTC (rev 7691)
@@ -13,6 +13,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- mapstring.c: possible buffer overflow in msGetPath (#2649)
+
 - maputil.c: Correct expression evaluation with text containing apostrophes (#2641)
 
 - mapwfs.c: Genrate possibly an error message when applying filter encoding (#2444)

Modified: trunk/mapserver/mapstring.c
===================================================================
--- trunk/mapserver/mapstring.c	2008-06-18 13:56:15 UTC (rev 7690)
+++ trunk/mapserver/mapstring.c	2008-06-18 18:07:15 UTC (rev 7691)
@@ -478,13 +478,15 @@
     }
   }
 
+  if(strcmp(str, fn) == 0)
+  {
+    msFree(str);
 #if defined(_WIN32) && !defined(__CYGWIN__)  
-  if(strcmp(str, fn) == 0)
-    strcpy(str, ".\\");
+    str = strdup(".\\");
 #else
-  if(strcmp(str, fn) == 0)
-    strcpy(str, "./");
+    str= strdup("./");
 #endif  
+  }
 
   return(str);
 }