Changeset 103000 in vbox

Timestamp:

Jan 23, 2024 3:58:08 PM (14 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

161232

Message:

iprt/bldprog-strtab-template.cpp.h: Fix comments to clang v15 doesn't barf on invalid UTF-8 source comments.

File:

• trunk/include/iprt/bldprog-strtab-template.cpp.h (modified) (6 diffs)

trunk/include/iprt/bldprog-strtab-template.cpp.h

@@ -821 +821 @@
     size_t cWords = 0;
     size_t iDict  = 0;
+# ifdef BLDPROG_STRTAB_PURE_ASCII
     for (size_t i = 0; i < RT_ELEMENTS(pThis->aCompDict); i++)
+# else
+    for (size_t i = 0; i < RT_ELEMENTS(pThis->aCompDict) - 1; i++)
+# endif
     {
         char        szTmp[2] = { (char)i, '\0' };
@@ -979 +983 @@
             bldProgStrTab_AddStringToHashTab(pThis, &pThis->aCompDict[i]);
 # ifdef RT_STRICT
-        else if (pThis->aCompDict[i].cchString != 1)
+        else if (   pThis->aCompDict[i].cchString != 1
+#  ifndef BLDPROG_STRTAB_PURE_ASCII
+                 && i != 0xff
+#  endif
+                )
             abort();
 # endif
@@ -1141 +1149 @@
 #endif
         {
+#ifdef BLDPROG_STRTAB_WITH_COMPRESSION
+            if (uch == 0xff)
+                abort();
+#endif
             if (uch != '\'' && uch != '\\')
                 fputc((char)uch, pOut);
@@ -1157 +1169 @@
             fprintf(pOut, "\\u%04x", uc);
         }
-# else
+# endif
         else
             fputs(pThis->aCompDict[uch].pszString, pOut);
-# endif
 #else
         else
@@ -1194 +1205 @@
     {
         if (BldProgBitIsSet(pThis->bmUsedChars, i)
-            ? pThis->aCompDict[i].cchString != 1 : pThis->aCompDict[i].cchString < 1)
+#  ifdef BLDPROG_STRTAB_PURE_ASCII
+            ? pThis->aCompDict[i].cchString != 1
+#  else
+            ? pThis->aCompDict[i].cchString != (i != 0xff ? 1 : 0)
+#  endif
+            : pThis->aCompDict[i].cchString < 1)
             abort();
         if (pThis->aCompDict[i].cchString > 1)
@@ -1291 +1307 @@
         else if (i == 0)
             fprintf(pOut, "    /*[%3u]=*/ { 0x000000, 0x00 }, // unused, because zero terminator\n", i);
-        else if (i < 0x20)
+        else if (i < 0x20 || i >= 0x7f)
             fprintf(pOut, "    /*[%3u]=*/ { 0x000000, 0x00 }, // %02x\n", i, i);
         else