#3847, coverity fixes around the loaders

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

diff --git a/loader/dbfopen.c b/loader/dbfopen.c
index e2054831b7cbe56a8671b492996af78ab27b690e..e80d1d6e8d942e280c4469d5d1066de815f6cd2b 100644 (file)
--- a/loader/dbfopen.c
+++ b/loader/dbfopen.c
@@ -686,14 +686,22 @@ DBFCreateLL( const char * pszFilename, const char * pszCodePage, SAHooks *psHook
 /* -------------------------------------------------------------------- */
     fp = psHooks->FOpen( pszFullname, "wb" );
     if( fp == NULL )
+       {
+               free(pszBasename);
+               free(pszFullname);
         return( NULL );
+       }
 
     psHooks->FWrite( &chZero, 1, 1, fp );
     psHooks->FClose( fp );
 
     fp = psHooks->FOpen( pszFullname, "rb+" );
     if( fp == NULL )
+       {
+               free(pszBasename);
+               free(pszFullname);
         return( NULL );
+       }
 
 
     sprintf( pszFullname, "%s.cpg", pszBasename );

diff --git a/loader/pgsql2shp-core.c b/loader/pgsql2shp-core.c
index 3d2d0e5987fe8c1999d1a9af456bbdebf5bcb25f..97762b33e8c73d6eb0bd1b988a2efa18fd9fca27 100644 (file)
--- a/loader/pgsql2shp-core.c
+++ b/loader/pgsql2shp-core.c
@@ -831,8 +831,11 @@ projFileCreate(SHPDUMPERSTATE *state)
                                fp = fopen( pszFullname, "wb" );
                                if ( fp == NULL )
                                {
+                                       free(pszFullname);
+                                       free(query);
                                        return 0;
                                }
+                               else
                                {
                                    result = fputs (srtext,fp);
                     LWDEBUGF(3, "\n result %d proj SRText is %s .\n", result, srtext);
@@ -1738,7 +1741,10 @@ ShpDumperOpenTable(SHPDUMPERSTATE *state)
                        */
                        dbffieldsize = getMaxFieldSize(state->conn, state->schema, state->table, pgfieldname);
                        if (dbffieldsize == -1)
+                       {
+                               free(dbffieldname);
                                return 0;
+                       }
 
                        if (!dbffieldsize)
                                dbffieldsize = 32;
@@ -2087,6 +2093,7 @@ int ShpLoaderGenerateShapeRow(SHPDUMPERSTATE *state)
                        {
                                snprintf(state->message, SHPDUMPERMSGLEN, _("Error parsing HEXEWKB for record %d"), state->currow);
                                PQclear(state->fetchres);
+                               free(hexewkb);
                                return SHPDUMPERERR;
                        }
 

diff --git a/loader/shp2pgsql-core.c b/loader/shp2pgsql-core.c
index 63f8ecb165707ac00dee31e75d5113b111789d6d..da4b136106f3dafcca60098ac8b90411cf6203f1 100644 (file)
--- a/loader/shp2pgsql-core.c
+++ b/loader/shp2pgsql-core.c
@@ -703,6 +703,9 @@ GeneratePolygonGeometry(SHPLOADERSTATE *state, SHPObject *obj, char **geometry)
 
        if ( !mem )
        {
+               /* Free the linked list of rings */
+               ReleasePolygons(Outer, polygon_total);
+
                snprintf(state->message, SHPLOADERMSGLEN, "unable to write geometry");
                return SHPLOADERERR;
        }
@@ -784,7 +787,7 @@ ShpLoaderCreate(SHPLOADERCONFIG *config)
        state->precisions = NULL;
        state->col_names = NULL;
        state->field_names = NULL;
-       state->num_fields = NULL;
+       state->num_fields = 0;
        state->pgfieldtypes = NULL;
 
        state->from_srid = config->shp_sr_id;
@@ -1613,10 +1616,10 @@ ShpLoaderGenerateSQLRowStatement(SHPLOADERSTATE *state, int item, char **strreco
                        default:
                                snprintf(state->message, SHPLOADERMSGLEN, _("Error: field %d has invalid or unknown field type (%d)"), i, state->types[i]);
 
+                               /* clean up and return err */
                                SHPDestroyObject(obj);
                                stringbuffer_destroy(sbwarn);
                                stringbuffer_destroy(sb);
-
                                return SHPLOADERERR;
                        }
 
@@ -1638,6 +1641,10 @@ ShpLoaderGenerateSQLRowStatement(SHPLOADERSTATE *state, int item, char **strreco
                                        if ( rv == UTF8_BAD_RESULT )
                                                free(utf8str);
 
+                                       /* clean up and return err */
+                                       SHPDestroyObject(obj);
+                                       stringbuffer_destroy(sbwarn);
+                                       stringbuffer_destroy(sb);
                                        return SHPLOADERERR;
                                }
                                strncpy(val, utf8str, MAXVALUELEN);

diff --git a/raster/loader/raster2pgsql.c b/raster/loader/raster2pgsql.c
index 4db7a1ead85268e48016eb1c8cc5504c57b968cd..18eaba53b97fe0a0c0b300aa0d19a047a8682c6f 100644 (file)
--- a/raster/loader/raster2pgsql.c
+++ b/raster/loader/raster2pgsql.c
@@ -511,7 +511,7 @@ static void
 init_rastinfo(RASTERINFO *info) {
        info->srid = SRID_UNKNOWN;
        info->srs = NULL;
-       memset(info->dim, 0, sizeof(double) * 2);
+       memset(info->dim, 0, sizeof(uint32_t) * 2);
        info->nband_count = 0;
        info->nband = NULL;
        info->gdalbandtype = NULL;