msXmpWrite(): avoid false positive warning about nullptr deref (CID 1…

…175242)
MapServer · May 15, 2021 · 55dcfd6 · 55dcfd6
1 parent 35d4084
commit 55dcfd6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/mapxmp.c b/mapxmp.c
@@ -214,7 +214,7 @@ msXmpWrite( mapObj *map, const char *filename )
 
   /* Check all the keys for "xmp_*_*" pattern */
   key = msFirstKeyFromHashTable(&hash_metadata);
-  do {
+  for( ; key != NULL; key = msNextKeyFromHashTable(&hash_metadata, key) ) {
     /* Our regex has two match slots */
     regmatch_t matches[3];
 
@@ -259,7 +259,7 @@ msXmpWrite( mapObj *map, const char *filename )
       msFree(ns_name);
       msFree(ns_tag);
     }
-  } while( (key = msNextKeyFromHashTable(&hash_metadata, key)) );
+  }
 
   /* Clean up regex */
   regfree(&xmp_regex);