[postgis-tickets] r16865 - Fix undefined behaviour in SADFWrite

[Raul]

Author: algunenano
Date: 2018-10-02 02:45:39 -0700 (Tue, 02 Oct 2018)
New Revision: 16865

Modified:
   branches/2.3/NEWS
   branches/2.3/loader/safileio.c
Log:
Fix undefined behaviour in SADFWrite

References #4189


Modified: branches/2.3/NEWS
===================================================================
--- branches/2.3/NEWS	2018-10-02 09:44:15 UTC (rev 16864)
+++ branches/2.3/NEWS	2018-10-02 09:45:39 UTC (rev 16865)
@@ -8,6 +8,7 @@
   - #3997, fix bug in lwgeom_median and avoid division by zero (Raúl Marín)
   - #4093, Inconsistent results from qsort callback (yugr)
   - #4160, Use qualified names in topology extension install (Raúl Marín)
+  - #4189, Fix undefined behaviour in SADFWrite (Raúl Marín)
 
 
 PostGIS 2.3.7

Modified: branches/2.3/loader/safileio.c
===================================================================
--- branches/2.3/loader/safileio.c	2018-10-02 09:44:15 UTC (rev 16864)
+++ branches/2.3/loader/safileio.c	2018-10-02 09:45:39 UTC (rev 16865)
@@ -115,8 +115,9 @@
 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 );
 }
 
 /************************************************************************/