Changeset 98001 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Jan 5, 2023 2:00:47 PM (2 years ago)

Author:

vboxsync

Message:

IPRT/errinfolog.cpp: Can't use parameter va_list with %N, must pass stack copy (known gcc issue). Also a bit wrong to use it multiple times w/o copying.

File:

• trunk/src/VBox/Runtime/common/err/errinfolog.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/err/errinfolog.cpp

@@ -92 +92 @@
         PRTLOGGER pLogger = RTLogRelGetDefaultInstanceExWeak(RT_MAKE_U32(RTLOGGRPFLAGS_LEVEL_1, iLogGroup));
         if (pLogger)
-            RTLogLoggerExWeak(pLogger, RTLOGGRPFLAGS_LEVEL_1, iLogGroup, "RTErrInfoSet(%Rrc): %N\n", rc, pszFormat, &va);
-    }
-
-    PRTLOGGER pLogger = RTLogGetDefaultInstanceExWeak(RT_MAKE_U32(RTLOGGRPFLAGS_LEVEL_1, iLogGroup));
-    if (pLogger)
-        RTLogLoggerExWeak(pLogger, RTLOGGRPFLAGS_LEVEL_1, iLogGroup, "RTErrInfoSet(%Rrc): %N\n", rc, pszFormat, &va);
+        {
+            va_list va2;
+            va_copy(va2, va);
+            RTLogLoggerExWeak(pLogger, RTLOGGRPFLAGS_LEVEL_1, iLogGroup, "RTErrInfoSet(%Rrc): %N\n", rc, pszFormat, &va2);
+            va_end(va2);
+        }
+    }
+
+    PRTLOGGER pLogger = RTLogGetDefaultInstanceExWeak(RT_MAKE_U32(RTLOGGRPFLAGS_LEVEL_1, iLogGroup));
+    if (pLogger)
+    {
+        va_list va2;
+        va_copy(va2, va);
+        RTLogLoggerExWeak(pLogger, RTLOGGRPFLAGS_LEVEL_1, iLogGroup, "RTErrInfoSet(%Rrc): %N\n", rc, pszFormat, &va2);
+        va_end(va2);
+    }
 
     /* The setting: */
@@ -184 +194 @@
         PRTLOGGER pLogger = RTLogRelGetDefaultInstanceExWeak(RT_MAKE_U32(RTLOGGRPFLAGS_LEVEL_1, iLogGroup));
         if (pLogger)
-            RTLogLoggerExWeak(pLogger, RTLOGGRPFLAGS_LEVEL_1, iLogGroup, "RTErrInfoAdd(%Rrc): %N\n", rc, pszFormat, &va);
-    }
-
-    PRTLOGGER pLogger = RTLogGetDefaultInstanceExWeak(RT_MAKE_U32(RTLOGGRPFLAGS_LEVEL_1, iLogGroup));
-    if (pLogger)
-        RTLogLoggerExWeak(pLogger, RTLOGGRPFLAGS_LEVEL_1, iLogGroup, "RTErrInfoAdd(%Rrc): %N\n", rc, pszFormat, &va);
-
-    return rc;
-}
-
+        {
+            va_list va2;
+            va_copy(va2, va);
+            RTLogLoggerExWeak(pLogger, RTLOGGRPFLAGS_LEVEL_1, iLogGroup, "RTErrInfoAdd(%Rrc): %N\n", rc, pszFormat, &va2);
+            va_end(va2);
+        }
+    }
+
+    PRTLOGGER pLogger = RTLogGetDefaultInstanceExWeak(RT_MAKE_U32(RTLOGGRPFLAGS_LEVEL_1, iLogGroup));
+    if (pLogger)
+    {
+        va_list va2;
+        va_copy(va2, va);
+        RTLogLoggerExWeak(pLogger, RTLOGGRPFLAGS_LEVEL_1, iLogGroup, "RTErrInfoAdd(%Rrc): %N\n", rc, pszFormat, &va2);
+        va_end(va2);
+    }
+
+    return rc;
+}
+