Fix undefined behaviour in SADFWrite

Also addresses several gcc warnings
References #4189

git-svn-id: http://svn.osgeo.org/postgis/branches/2.5@16862 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/NEWS b/NEWS
index 118b6ad7be2dd7f8813fca264af2d444d0795cf6..83fc6b9a3e1759c4f5ab99a996d503b9333df376 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ XXXX/XX/XX
  * Bug fixes *
   - #4183, St_AsMVTGeom: Drop invalid geometries after simplification (Raúl Marín)
   - #4188, Avoid division by zero in kmeans (Raúl Marín)
+  - #4189, Fix undefined behaviour in SADFWrite (Raúl Marín)
 
 PostGIS 2.5.0
 2018/09/23

diff --git a/liblwgeom/lwutil.c b/liblwgeom/lwutil.c
index 0e7488706e34e84fa31d9bf6e3baa6bbd8d566ab..f34b3e8dba23cc9eaf8c014365ab9260dfc4a45c 100644 (file)
--- a/liblwgeom/lwutil.c
+++ b/liblwgeom/lwutil.c
@@ -282,13 +282,13 @@ char *lwmessage_truncate(char *str, int startpos, int endpos, int maxlength, int
                        {
                                /* Add "..." prefix */
                                outstart = str + endpos + 1 - maxlength + 3;
-                               strncat(output, "...", 3);
+                               strncat(output, "...", 4);
                                strncat(output, outstart, maxlength - 3);
                        }
                        else
                        {
                                /* maxlength is too small; just output "..." */
-                               strncat(output, "...", 3);
+                               strncat(output, "...", 4);
                        }
                }
        }
@@ -309,12 +309,12 @@ char *lwmessage_truncate(char *str, int startpos, int endpos, int maxlength, int
                                /* Add "..." suffix */
                                outstart = str + startpos;
                                strncat(output, outstart, maxlength - 3);
-                               strncat(output, "...", 3);
+                               strncat(output, "...", 4);
                        }
                        else
                        {
                                /* maxlength is too small; just output "..." */
-                               strncat(output, "...", 3);
+                               strncat(output, "...", 4);
                        }
                }
        }

diff --git a/loader/pgsql2shp-core.c b/loader/pgsql2shp-core.c
index ffbc613c6b4f80d6826847ee34106d58296826b7..aa9c26b5e07abf15761adda1f972a1218073ee8b 100644 (file)
--- a/loader/pgsql2shp-core.c
+++ b/loader/pgsql2shp-core.c
@@ -1549,7 +1549,7 @@ ShpDumperOpenTable(SHPDUMPERSTATE *state)
                {
                        if (!strncasecmp(dbffieldname, state->dbffieldnames[j], 10))
                        {
-                               sprintf(dbffieldname, "%.7s_%.2d", ptr, tmpint % 100);
+                               sprintf(dbffieldname, "%.7s_%.2d", ptr, abs(tmpint) % 100);
                                tmpint++;
                                continue;
                        }

diff --git a/loader/safileio.c b/loader/safileio.c
index 439ebb141f2a707e015468c0f4ff0d229b090c80..ee5a98afbe26a4aaf2ae82c2360de726a92e712a 100644 (file)
--- a/loader/safileio.c
+++ b/loader/safileio.c
@@ -115,8 +115,9 @@ SAOffset SADFRead( void *p, SAOffset size, SAOffset nmemb, SAFile file )
 SAOffset SADFWrite( void *p, SAOffset size, SAOffset nmemb, SAFile file )
 
 {
-    return (SAOffset) fwrite( p, (size_t) size, (size_t) nmemb,
-                              (FILE *) file );
+       if (!nmemb || !p) return 0;
+       return (SAOffset) fwrite( p, (size_t) size, (size_t) nmemb,
+                               (FILE *) file );
 }
 
 /************************************************************************/