Making safer a strcpy + eliminating an invalid comment

AbelPau · Apr 17, 2024 · 77860ec · 77860ec
1 parent 5f58978
commit 77860ec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ogr/ogrsf_frmts/miramon/mm_gdal_functions.c b/ogr/ogrsf_frmts/miramon/mm_gdal_functions.c
@@ -2407,7 +2407,10 @@ int MM_SecureCopyStringFieldValue(char **pszStringDst, const char *pszStringSrc,
         (*pszStringDst) = new_ptr;
         *nStringCurrentLength = (MM_EXT_DBF_N_FIELDS)(strlen(pszStringSrc) + 1);
     }
-    strcpy(*pszStringDst, pszStringSrc);
+    if (*pszStringSrc == '\0')
+        *pszStringDst = '\0';
+    else
+        strcpy(*pszStringDst, pszStringSrc);
     return 0;
 }
 

diff --git a/ogr/ogrsf_frmts/miramon/ogrmiramonlayer.cpp b/ogr/ogrsf_frmts/miramon/ogrmiramonlayer.cpp
@@ -2365,7 +2365,6 @@ OGRErr OGRMiraMonLayer::TranslateFieldsValuesToMM(OGRFeature *poFeature)
                                           hMMFeature.pRecords[0].nNumField))
                 return OGRERR_NOT_ENOUGH_MEMORY;
 
-            // MiraMon encoding is ISO 8859-1 (Latin1) -> Recode from UTF-8
             if (MM_SecureCopyStringFieldValue(
                     &hMMFeature.pRecords[0].pField[iField].pDinValue,
                     pszRawValue,