maptree.c: fix warning about nullptr deref (CID 1174351)

MapServer · May 23, 2021 · 972e512 · 972e512
1 parent 98b8572
commit 972e512
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/maptree.c b/maptree.c
@@ -608,13 +608,15 @@ treeNodeObj *readTreeNode( SHPTreeHandle disktree )
     return NULL;
   }
   if( node->numshapes > 0 )
-    node->ids = (ms_int32 *)msSmallMalloc(sizeof(ms_int32)*node->numshapes);
-  res = fread( node->ids, node->numshapes*4, 1, disktree->fp );
-  if ( !res )
   {
-    free(node->ids);
-    free(node);
-    return NULL;
+    node->ids = (ms_int32 *)msSmallMalloc(sizeof(ms_int32)*node->numshapes);
+    res = fread( node->ids, node->numshapes*4, 1, disktree->fp );
+    if ( !res )
+    {
+      free(node->ids);
+      free(node);
+      return NULL;
+    }
   }
   for( i=0; i < node->numshapes; i++ ) {
     if ( disktree->needswap ) SwapWord ( 4, &node->ids[i] );