msLoadFontSet(): fix null pointer dereference

Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=52131
MapServer · Oct 6, 2022 · e2a6d22 · e2a6d22
1 parent 63cf884
commit e2a6d22
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/maplabel.c b/maplabel.c
@@ -804,6 +804,7 @@ int msLoadFontSet(fontSetObj *fontset, mapObj *map)
   char szPath[MS_MAXPATHLEN];
   int i;
   int bFullPath = 0;
+  const char* realpath;
 
   if(fontset->numfonts != 0) /* already initialized */
     return(0);
@@ -821,7 +822,12 @@ int msLoadFontSet(fontSetObj *fontset, mapObj *map)
   /* return(-1); */
   /* } */
 
-  stream = VSIFOpenL( msBuildPath(szPath, fontset->map->mappath, fontset->filename), "rb");
+  realpath = msBuildPath(szPath, fontset->map->mappath, fontset->filename);
+  if( !realpath ) {
+    free(path);
+    return -1;
+  }
+  stream = VSIFOpenL( realpath, "rb");
   if(!stream) {
     msSetError(MS_IOERR, "Error opening fontset %s.", "msLoadFontset()",
                fontset->filename);