[geos-commits] [SCM] GEOS branch master updated. a5e8b64efc516c2592016235443dac166034fe7f

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, master has been updated
       via  a5e8b64efc516c2592016235443dac166034fe7f (commit)
       via  e6f315d314593a200c5cfd43d40328454b66d8f5 (commit)
      from  feb35a0fd17ed5f5cfe35ef7bd89693e057a0493 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a5e8b64efc516c2592016235443dac166034fe7f
Merge: e6f315d feb35a0
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Mon Apr 20 08:12:14 2020 -0700

    Merge branch 'master' of https://git.osgeo.org/gitea/geos/geos


commit e6f315d314593a200c5cfd43d40328454b66d8f5
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Mon Apr 20 08:11:57 2020 -0700

    Remove undefined behaviour in CPI, closes #1021

diff --git a/NEWS b/NEWS
index e8ccc23..7c07c32 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ Changes in 3.9.0
   - Testing on Rasberry Pi 32-bit (berrie) (#1017, Bruce Rindahl, Regina Obe)
   - Replace ttmath with JTS DD double-double implementation (Paul Ramsey)
   - Fix bug in DistanceOp for geometries with empty components (#1026, Paul Ramsey)
+  - Remove undefined behaviour in CAPI (#1021, Greg Troxel)
 
 
 Changes in 3.8.0
diff --git a/capi/geos_ts_c.cpp b/capi/geos_ts_c.cpp
index 9c3e810..d46a0af 100644
--- a/capi/geos_ts_c.cpp
+++ b/capi/geos_ts_c.cpp
@@ -234,7 +234,7 @@ typedef struct GEOSContextHandle_HS {
     }
 
     void
-    NOTICE_MESSAGE(string fmt, ...)
+    NOTICE_MESSAGE(const char *fmt, ...)
     {
         if(nullptr == noticeMessageOld && nullptr == noticeMessageNew) {
             return;
@@ -242,7 +242,7 @@ typedef struct GEOSContextHandle_HS {
 
         va_list args;
         va_start(args, fmt);
-        int result = vsnprintf(msgBuffer, sizeof(msgBuffer) - 1, fmt.c_str(), args);
+        int result = vsnprintf(msgBuffer, sizeof(msgBuffer) - 1, fmt, args);
         va_end(args);
 
         if(result > 0) {
@@ -256,7 +256,7 @@ typedef struct GEOSContextHandle_HS {
     }
 
     void
-    ERROR_MESSAGE(string fmt, ...)
+    ERROR_MESSAGE(const char *fmt, ...)
     {
         if(nullptr == errorMessageOld && nullptr == errorMessageNew) {
             return;
@@ -264,7 +264,7 @@ typedef struct GEOSContextHandle_HS {
 
         va_list args;
         va_start(args, fmt);
-        int result = vsnprintf(msgBuffer, sizeof(msgBuffer) - 1, fmt.c_str(), args);
+        int result = vsnprintf(msgBuffer, sizeof(msgBuffer) - 1, fmt, args);
         va_end(args);
 
         if(result > 0) {

-----------------------------------------------------------------------

Summary of changes:
 NEWS               | 1 +
 capi/geos_ts_c.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GEOS