[Git][debian-gis-team/mapserver][upstream] New upstream version 8.2.0~rc3

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / mapserver


Commits:
c64f450f by Bas Couwenberg at 2024-06-28T15:44:52+02:00
New upstream version 8.2.0~rc3
- - - - -


4 changed files:

- CMakeLists.txt
- HISTORY.md
- INSTALL → INSTALL.md
- src/mapfile.c


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -18,7 +18,7 @@ include(CheckCSourceCompiles)
 set (MapServer_VERSION_MAJOR 8)
 set (MapServer_VERSION_MINOR 2)
 set (MapServer_VERSION_REVISION 0)
-set (MapServer_VERSION_SUFFIX "-rc2")
+set (MapServer_VERSION_SUFFIX "-rc3")
 
 # Set C++ version
 # Make CMAKE_CXX_STANDARD available as cache option overridable by user


=====================================
HISTORY.md
=====================================
@@ -13,6 +13,11 @@ https://mapserver.org/development/changelog/
 
 The online Migration Guide can be found at https://mapserver.org/MIGRATION_GUIDE.html
 
+8.2.0-rc3 release (2024-06-28)
+------------------------------
+
+- fix memory corruption in msUpdate...FromString (#7038)
+
 8.2.0-rc2 release (2024-06-27)
 ------------------------------
 


=====================================
INSTALL → INSTALL.md
=====================================
@@ -4,11 +4,11 @@ instructions.
 Unix compilation instructions
 -----------------------------
 
-See INSTALL.CMAKE or the document on the MapServer website at 
-<https://mapserver.org/installation/unix.html>
+See [INSTALL.CMAKE](INSTALL.CMAKE) or the document on the MapServer website at 
+https://mapserver.org/installation/unix.html
 
 Win32 compilation instructions
 ------------------------------
 
 See README.WIN32 or the document on the MapServer website at
-<https://mapserver.org/installation/win32.html>
+https://mapserver.org/installation/win32.html


=====================================
src/mapfile.c
=====================================
@@ -2102,9 +2102,9 @@ int msUpdateLabelFromString(labelObj *label, char *string) {
     return MS_FAILURE; /* parse error */
     ;
   }
-  msReleaseLock(TLOCK_PARSER);
 
   msyylex_destroy();
+  msReleaseLock(TLOCK_PARSER);
   return MS_SUCCESS;
 }
 
@@ -2616,9 +2616,9 @@ int msUpdateClusterFromString(clusterObj *cluster, char *string) {
     return MS_FAILURE; /* parse error */
     ;
   }
-  msReleaseLock(TLOCK_PARSER);
 
   msyylex_destroy();
+  msReleaseLock(TLOCK_PARSER);
   return MS_SUCCESS;
 }
 
@@ -3096,9 +3096,9 @@ int msUpdateStyleFromString(styleObj *style, char *string) {
     return MS_FAILURE; /* parse error */
     ;
   }
-  msReleaseLock(TLOCK_PARSER);
 
   msyylex_destroy();
+  msReleaseLock(TLOCK_PARSER);
   return MS_SUCCESS;
 }
 
@@ -3766,9 +3766,9 @@ int msUpdateClassFromString(classObj *class, char *string) {
     return MS_FAILURE; /* parse error */
     ;
   }
-  msReleaseLock(TLOCK_PARSER);
 
   msyylex_destroy();
+  msReleaseLock(TLOCK_PARSER);
 
   if (classResolveSymbolNames(class) != MS_SUCCESS)
     return MS_FAILURE;
@@ -4836,9 +4836,9 @@ int msUpdateLayerFromString(layerObj *layer, char *string) {
     return MS_FAILURE; /* parse error */
     ;
   }
-  msReleaseLock(TLOCK_PARSER);
 
   msyylex_destroy();
+  msReleaseLock(TLOCK_PARSER);
 
   /* step through classes to resolve symbol names */
   for (i = 0; i < layer->numclasses; i++) {
@@ -5249,9 +5249,9 @@ int msUpdateReferenceMapFromString(referenceMapObj *ref, char *string) {
     return MS_FAILURE; /* parse error */
     ;
   }
-  msReleaseLock(TLOCK_PARSER);
 
   msyylex_destroy();
+  msReleaseLock(TLOCK_PARSER);
   return MS_SUCCESS;
 }
 
@@ -5643,9 +5643,9 @@ int msUpdateLegendFromString(legendObj *legend, char *string) {
     return MS_FAILURE; /* parse error */
     ;
   }
-  msReleaseLock(TLOCK_PARSER);
 
   msyylex_destroy();
+  msReleaseLock(TLOCK_PARSER);
   return MS_SUCCESS;
 }
 
@@ -5842,9 +5842,9 @@ int msUpdateScalebarFromString(scalebarObj *scalebar, char *string) {
     return MS_FAILURE; /* parse error */
     ;
   }
-  msReleaseLock(TLOCK_PARSER);
 
   msyylex_destroy();
+  msReleaseLock(TLOCK_PARSER);
   return MS_SUCCESS;
 }
 
@@ -5991,9 +5991,9 @@ int msUpdateQueryMapFromString(queryMapObj *querymap, char *string) {
     return MS_FAILURE; /* parse error */
     ;
   }
-  msReleaseLock(TLOCK_PARSER);
 
   msyylex_destroy();
+  msReleaseLock(TLOCK_PARSER);
   return MS_SUCCESS;
 }
 
@@ -6240,9 +6240,9 @@ int msUpdateWebFromString(webObj *web, char *string) {
     return MS_FAILURE; /* parse error */
     ;
   }
-  msReleaseLock(TLOCK_PARSER);
 
   msyylex_destroy();
+  msReleaseLock(TLOCK_PARSER);
   return MS_SUCCESS;
 }
 
@@ -6966,6 +6966,7 @@ mapObj *msLoadMapFromString(char *buffer, char *new_mappath,
   if (!msGetCWD(szCWDPath, MS_MAXPATHLEN, "msLoadMapFromString()")) {
     msFreeMap(map);
     msReleaseLock(TLOCK_PARSER);
+    return (NULL);
   }
   if (new_mappath) {
     mappath = msStrdup(new_mappath);
@@ -7111,12 +7112,12 @@ mapObj *msLoadMap(const char *filename, const char *new_mappath,
 
   if (loadMapInternal(map) != MS_SUCCESS) {
     msFreeMap(map);
-    msReleaseLock(TLOCK_PARSER);
     if (msyyin) {
       msyycleanup_includes();
       fclose(msyyin);
       msyyin = NULL;
     }
+    msReleaseLock(TLOCK_PARSER);
     return NULL;
   }
   msReleaseLock(TLOCK_PARSER);



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/commit/c64f450f927261b60cdf67487eb8ecd8a23cb8e3

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/commit/c64f450f927261b60cdf67487eb8ecd8a23cb8e3
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240628/f7cf5410/attachment-0001.htm>