MITAB: Disable table fields "laundering" for non-neutral charset

OSGeo · Jun 25, 2024 · b30dab2 · b30dab2
1 parent 2afacf4
commit b30dab2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/ogr/ogrsf_frmts/mitab/mitab_tabfile.cpp b/ogr/ogrsf_frmts/mitab/mitab_tabfile.cpp
@@ -1189,7 +1189,8 @@ int TABFile::WriteTABFile()
                 if (strlen(GetEncoding()) > 0)
                     osFieldName.Recode(CPL_ENC_UTF8, GetEncoding());
 
-                char *pszCleanName = TABCleanFieldName(osFieldName);
+                char *pszCleanName =
+                    TABCleanFieldName(osFieldName, GetEncoding());
                 osFieldName = pszCleanName;
                 CPLFree(pszCleanName);
 

diff --git a/ogr/ogrsf_frmts/mitab/mitab_utils.cpp b/ogr/ogrsf_frmts/mitab/mitab_utils.cpp
@@ -455,7 +455,7 @@ char *TABEscapeString(char *pszString)
  *
  * The returned string should be freed by the caller.
  **********************************************************************/
-char *TABCleanFieldName(const char *pszSrcName)
+char *TABCleanFieldName(const char *pszSrcName, const char *pszEncoding)
 {
     char *pszNewName = CPLStrdup(pszSrcName);
     if (strlen(pszNewName) > 31)
@@ -481,6 +481,7 @@ char *TABCleanFieldName(const char *pszSrcName)
     // It was also verified that extended chars with accents are also
     // accepted.
     int numInvalidChars = 0;
+    bool bNeutralCharset = (pszEncoding == nullptr || strlen(pszEncoding) == 0);
     for (int i = 0; pszSrcName && pszSrcName[i] != '\0'; i++)
     {
         if (pszSrcName[i] == '#')
@@ -493,7 +494,7 @@ char *TABCleanFieldName(const char *pszSrcName)
         }
         else if (!(pszSrcName[i] == '_' ||
                    (i != 0 && pszSrcName[i] >= '0' && pszSrcName[i] <= '9') ||
-                   (pszSrcName[i] >= 'a' && pszSrcName[i] <= 'z') ||
+                   (!bNeutralCharset || (pszSrcName[i] >= 'a' && pszSrcName[i] <= 'z') ||
                    (pszSrcName[i] >= 'A' && pszSrcName[i] <= 'Z') ||
                    static_cast<GByte>(pszSrcName[i]) >= 192))
         {

diff --git a/ogr/ogrsf_frmts/mitab/mitab_utils.h b/ogr/ogrsf_frmts/mitab/mitab_utils.h
@@ -54,7 +54,7 @@ char **TAB_CSLLoad(const char *pszFname);
 char *TABEscapeString(char *pszString);
 char *TABUnEscapeString(char *pszString, GBool bSrcIsConst);
 
-char *TABCleanFieldName(const char *pszSrcName);
+char *TABCleanFieldName(const char *pszSrcName, const char *pszCharset);
 
 const char *TABUnitIdToString(int nId);
 int TABUnitIdFromString(const char *pszName);