Changeset 93952 in vbox

Timestamp:

Feb 25, 2022 2:24:07 PM (3 years ago)

Author:

vboxsync

Message:

DevFwCommon: Tweaks for making it build with GCC 11.2.1 and some cleanups.

File:

• trunk/src/VBox/Devices/PC/DevFwCommon.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/PC/DevFwCommon.cpp

@@ -489 +489 @@
                                            N_("Configuration error: Querying \"" name "\" as a string failed")); \
             } \
-            else if (!strcmp(szBuf, "<EMPTY>")) \
+            if (!strcmp(szBuf, "<EMPTY>")) \
                 pszTmp = ""; \
             else \
@@ -499 +499 @@
         { \
             variable = iStrNr++; \
-            size_t cStr = strlen(pszTmp) + 1; \
-            DMI_CHECK_SIZE(cStr); \
-            memcpy(pszStr, pszTmp, cStr); \
-            pszStr += cStr ; \
+            size_t const cbStr = strlen(pszTmp) + 1; \
+            DMI_CHECK_SIZE(cbStr); \
+            pszStr = (char *)mempcpy(pszStr, pszTmp, cbStr); \
         } \
     }
@@ -529 +528 @@
     }
 
-#define DMI_START_STRUCT(tbl) \
-        pszStr                       = (char *)(tbl + 1); \
-        iStrNr                       = 1;
-
-#define DMI_TERM_STRUCT \
-    { \
+#define DMI_START_STRUCT(a_pTbl) do { \
+        pszStr = (char *)((a_pTbl) + 1); \
+        iStrNr = 1; \
+    } while (0)
+
+#if 0 /* GCC 11.2.1 barfs on this: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] */
+# define DMI_TERM_STRUCT do { \
         *pszStr++                    = '\0'; /* terminate set of text strings */ \
         if (iStrNr == 1) \
             *pszStr++                = '\0'; /* terminate a structure without strings */ \
-    }
+    } while (0)
+#else
+# define DMI_TERM_STRUCT do { \
+        size_t const cbToZero = iStrNr == 1 ? 2 : 1; \
+        pszStr = (char *)memset(pszStr, 0, cbToZero) + cbToZero; \
+    } while (0)
+#endif
 
     bool fForceDefault = false;
@@ -730 +736 @@
         PDMICHASSIS pChassis         = (PDMICHASSIS)pszStr;
         DMI_CHECK_SIZE(sizeof(*pChassis));
-        pszStr                       = (char*)&pChassis->u32OEMdefined;
+        pszStr                       = (char *)&pChassis->u32OEMdefined;
         iStrNr                       = 1;
 #ifdef VBOX_WITH_DMI_CHASSIS
@@ -781 +787 @@
         pProcessorInf->u8SocketDesignation = iStrNr++;
         {
-            size_t cStr = strlen(szSocket) + 1;
-            DMI_CHECK_SIZE(cStr);
-            memcpy(pszStr, szSocket, cStr);
-            pszStr += cStr;
+            size_t cbStr = strlen(szSocket) + 1;
+            DMI_CHECK_SIZE(cbStr);
+            pszStr = (char *)mempcpy(pszStr, szSocket, cbStr);
         }
         pProcessorInf->u8ProcessorType     = 0x03; /* Central Processor */