[postgis-tickets] r15675 - Fix colmap dbf logic (should be i++ and not ++i). Also check if map != NULL before attempting size check.

[Regina Obe]

Author: robe
Date: 2017-09-09 19:22:40 -0700 (Sat, 09 Sep 2017)
New Revision: 15675

Modified:
   trunk/loader/shpcommon.c
Log:
Fix colmap dbf logic (should be i++ and not ++i). Also check if map != NULL before attempting size check.
References PostGIS 2.4.0 for #3839

Modified: trunk/loader/shpcommon.c
===================================================================
--- trunk/loader/shpcommon.c	2017-09-10 01:52:23 UTC (rev 15674)
+++ trunk/loader/shpcommon.c	2017-09-10 02:22:40 UTC (rev 15675)
@@ -166,24 +166,26 @@
 void
 colmap_clean(colmap *map)
 {
-  int i;
-  if (map->size)
-  {
-    for (i = 0; i < map->size; i++)
-    {
-      if (map->pgfieldnames[i]) free(map->pgfieldnames[i]);
-      if (map->dbffieldnames[i]) free(map->dbffieldnames[i]);
-    }
-    free(map->pgfieldnames);
-    free(map->dbffieldnames);
-  }
+	int i;
+	if (map != NULL){
+		if (map->size)
+		{
+			for (i = 0; i < map->size; i++)
+			{
+				if (map->pgfieldnames[i]) free(map->pgfieldnames[i]);
+				if (map->dbffieldnames[i]) free(map->dbffieldnames[i]);
+			}
+			free(map->pgfieldnames);
+			free(map->dbffieldnames);
+		}
+	}
 }
 
 const char *
 colmap_dbf_by_pg(colmap *map, const char *pgname)
 {
   int i;
-  for (i=0; i<map->size; ++i)
+  for (i=0; i<map->size; i++)
   {
     if (!strcasecmp(map->pgfieldnames[i], pgname))
     {
@@ -197,7 +199,7 @@
 colmap_pg_by_dbf(colmap *map, const char *dbfname)
 {
   int i;
-  for (i=0; i<map->size; ++i)
+  for (i=0; i<map->size; i++)
   {
     if (!strcasecmp(map->dbffieldnames[i], dbfname))
     {