Fix colmap dbf logic (should be i++ and not ++i). Also check if map != NULL before...

References PostGIS 2.4.0 for #3839

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

diff --git a/loader/shpcommon.c b/loader/shpcommon.c
index d1e3e1647bd79d413b63ad7e153dc2b0e7d17187..d9e25b1f17e1ec3f2be8f8bb7915ac631b703ae4 100644 (file)
--- a/loader/shpcommon.c
+++ b/loader/shpcommon.c
@@ -166,24 +166,26 @@ colmap_init(colmap *map)
 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 @@ const char *
 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))
     {