[Git][debian-gis-team/mapserver][experimental] 4 commits: New upstream version 7.6.0~rc2

[Bas Couwenberg]

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


Commits:
506b266e by Bas Couwenberg at 2020-04-11T06:43:23+02:00
New upstream version 7.6.0~rc2
- - - - -
383e7703 by Bas Couwenberg at 2020-04-11T06:43:40+02:00
Update upstream source from tag 'upstream/7.6.0_rc2'

Update to upstream version '7.6.0~rc2'
with Debian dir 3cdbfa4ad67c421b39cbdb080efaee0f50993cc5
- - - - -
20acaebb by Bas Couwenberg at 2020-04-11T06:46:07+02:00
New upstream release candidate.

- - - - -
2209f5d4 by Bas Couwenberg at 2020-04-11T06:48:18+02:00
Set distribution to experimental.

- - - - -


4 changed files:

- CMakeLists.txt
- HISTORY.TXT
- debian/changelog
- mapgeos.c


Changes:

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


=====================================
HISTORY.TXT
=====================================
@@ -12,6 +12,11 @@ For a complete change history, please see the Git log comments.  For more
 details about recent point releases, please see the online changelog at:
 http://mapserver.org/development/changelog/
 
+7.6.0-rc2 release (2020-04-10)
+------------------------------
+
+- Fix memory corruption in msGEOSGetCentroid (#6041)
+
 7.6.0-rc1 release (2020-04-05)
 ------------------------------
 


=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+mapserver (7.6.0~rc2-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 11 Apr 2020 06:47:59 +0200
+
 mapserver (7.6.0~rc1-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate.


=====================================
mapgeos.c
=====================================
@@ -943,6 +943,7 @@ pointObj *msGEOSGetCentroid(shapeObj *shape)
   if(!g1) return NULL;
 
   g2 = GEOSGetCentroid_r(handle,g1);
+  if (!g2) return NULL;
 
   point = (pointObj *) malloc(sizeof(pointObj));
 
@@ -952,7 +953,7 @@ pointObj *msGEOSGetCentroid(shapeObj *shape)
   GEOSCoordSeq_getY_r(handle,coords, 0, &(point->y));
   /* GEOSCoordSeq_getZ(coords, 0, &(point->z)); */
 
-  GEOSCoordSeq_destroy_r(handle,coords);
+  GEOSGeom_destroy_r(handle, g2);
 
   return point;
 #else



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/compare/ced1545a823d81548508d6e8c37212712f2759a9...2209f5d4d30ec74fc769772a058a886cecd358e0

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/compare/ced1545a823d81548508d6e8c37212712f2759a9...2209f5d4d30ec74fc769772a058a886cecd358e0
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/20200411/da6de341/attachment-0001.html>