hdf-eos: Coverity Scan fixes

rouault · Nov 26, 2024 · 950cd2a · 950cd2a
1 parent 1e3a6d5
commit 950cd2a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/frmts/hdf4/hdf-eos/EHapi.c b/frmts/hdf4/hdf-eos/EHapi.c
@@ -1611,7 +1611,10 @@ EHmetagroup(int32 sdInterfaceID, const char *structname, const char *structcode,
 	metaptr = strstr(metaptr, utlstr);
 
 	snprintf(utlstr, UTLSTR_MAX_SIZE, "%s%s", "\t\tEND_GROUP=", groupname);
-	endptr = strstr(metaptr, utlstr);
+	if (metaptr)
+	    endptr = strstr(metaptr, utlstr);
+	else
+	    endptr = NULL;
     } else
     {
 	/* If groupname == NULL then find end of structure in metadata */

diff --git a/frmts/hdf4/hdf-eos/GDapi.c b/frmts/hdf4/hdf-eos/GDapi.c
@@ -602,10 +602,6 @@ GDchkgdid(int32 gridID, const char *routname,
 	/* Compute "reduced" ID */
 	/* -------------------- */
 	gID = gridID % idOffset;
-	if (gID >= NGRID)
-	{
-	   return -1;
-	}
 
 	/* Check for active grid ID */
 	/* ------------------------ */
@@ -3117,6 +3113,7 @@ GDnentries(int32 gridID, int32 entrycode, int32 * strbufsize)
 	if (!metabuf || metaptrs[0] == NULL)
     {
         free(metabuf);
+        free(utlstr);
         return -1;
     }
 

diff --git a/frmts/hdf4/hdf-eos/SWapi.c b/frmts/hdf4/hdf-eos/SWapi.c
@@ -585,10 +585,6 @@ SWchkswid(int32 swathID, const char *routname,
     else
     {
 	int sID = swathID % idOffset;
-	if (sID >= NSWATH)
-	{
-	    return -1;
-	}
 	/* Check for active swath ID */
 	/* ------------------------- */
 	if (SWXSwath[sID].active == 0)
@@ -3023,6 +3019,7 @@ SWSDfldsrch(int32 swathID, int32 sdInterfaceID, const char *fieldname,
     sID = swathID % idOffset;
     if (sID >= NSWATH)
     {
+        free(utlstr);
         return -1;
     }