Merge pull request #9955 from OSGeo/backport-9954-to-release/3.9

[Backport release/3.9] MiraMonVector: Fixing chromium bug 68809
OSGeo · May 16, 2024 · 891825f · 891825f
2 parents 3feb129 + cb49511
commit 891825f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/ogr/ogrsf_frmts/miramon/mm_gdal_functions.c b/ogr/ogrsf_frmts/miramon/mm_gdal_functions.c
@@ -1695,13 +1695,17 @@ int MM_ReadExtendedDBFHeaderFromFile(const char *szFileName,
     return 0;
 }  // End of MM_ReadExtendedDBFHeaderFromFile()
 
-void MM_ReleaseDBFHeader(struct MM_DATA_BASE_XP *data_base_XP)
+void MM_ReleaseDBFHeader(struct MM_DATA_BASE_XP **data_base_XP)
 {
-    if (data_base_XP)
-    {
-        MM_ReleaseMainFields(data_base_XP);
-        free_function(data_base_XP);
-    }
+    if (!data_base_XP)
+        return;
+    if (!*data_base_XP)
+        return;
+
+    MM_ReleaseMainFields(*data_base_XP);
+    free_function(*data_base_XP);
+    *data_base_XP = nullptr;
+
     return;
 }
 

diff --git a/ogr/ogrsf_frmts/miramon/mm_gdal_functions.h b/ogr/ogrsf_frmts/miramon/mm_gdal_functions.h
@@ -102,7 +102,7 @@ MM_GiveOffsetExtendedFieldName(const struct MM_FIELD *camp);
 struct MM_DATA_BASE_XP *MM_CreateDBFHeader(MM_EXT_DBF_N_FIELDS n_camps,
                                            MM_BYTE nCharSet);
 void MM_ReleaseMainFields(struct MM_DATA_BASE_XP *data_base_XP);
-void MM_ReleaseDBFHeader(struct MM_DATA_BASE_XP *data_base_XP);
+void MM_ReleaseDBFHeader(struct MM_DATA_BASE_XP **data_base_XP);
 MM_BOOLEAN MM_CreateAndOpenDBFFile(struct MM_DATA_BASE_XP *bd_xp,
                                    const char *NomFitxer);
 int MM_DuplicateFieldDBXP(struct MM_FIELD *camp_final,

diff --git a/ogr/ogrsf_frmts/miramon/mm_wrlayr.c b/ogr/ogrsf_frmts/miramon/mm_wrlayr.c
@@ -7397,8 +7397,8 @@ static void MMDestroyMMDBFile(struct MiraMonVectLayerInfo *hMiraMonLayer,
 
     if (pMMAdmDB && pMMAdmDB->pMMBDXP)
     {
-        MM_ReleaseDBFHeader(pMMAdmDB->pMMBDXP);
-        hMiraMonLayer->pMMBDXP = pMMAdmDB->pMMBDXP = nullptr;
+        MM_ReleaseDBFHeader(&pMMAdmDB->pMMBDXP);
+        hMiraMonLayer->pMMBDXP = nullptr;
     }
     if (pMMAdmDB && pMMAdmDB->pRecList)
     {