Changeset 58104 in vbox for trunk

Timestamp:

Oct 7, 2015 4:26:05 PM (9 years ago)

Author:

vboxsync

Message:

src/libs/xpcom: a couple of missing va_end()

Location:

trunk/src/libs/xpcom18a4

Files:

• python/src/ErrorUtils.cpp (modified) (3 diffs)
• python/src/loader/pyloader.cpp (modified) (2 diffs)
• xpcom/ds/nsTimelineService.cpp (modified) (2 diffs)

trunk/src/libs/xpcom18a4/python/src/ErrorUtils.cpp

@@ -226 +226 @@
                 LogMessage(LOGGER_ERROR, streamout);
         }
+    va_end(marker);
 }
 
@@ -233 +234 @@
         va_start(marker, fmt);
         VLogF(LOGGER_WARNING, fmt, marker);
+    va_end(marker);
 }
 
@@ -246 +248 @@
         va_start(marker, fmt);
         VLogF(LOGGER_DEBUG, fmt, marker);
+    va_end(marker);
 }
 #endif

trunk/src/libs/xpcom18a4/python/src/loader/pyloader.cpp

@@ -321 +321 @@
         }
         PyErr_Restore(exc_typ, exc_val, exc_tb);
+    va_end(marker);
 }
 /*** - not currently used - silence compiler warning.
@@ -336 +337 @@
         va_start(marker, fmt);
         VLogF("PyXPCOM Loader Debug: ", fmt, marker);
+    va_end(marker);
 }
 #else

trunk/src/libs/xpcom18a4/xpcom/ds/nsTimelineService.cpp

@@ -371 +371 @@
     va_start(args, text);
     NS_TimelineMarkV(text, args);
+    va_end(args);
 
     return NS_OK;
@@ -378 +379 @@
 {
     va_list args;
+
+    PR_CallOnce(&initonce, TimelineInit);
+
+    if (gTimelineDisabled)
+        return NS_ERROR_NOT_AVAILABLE;
+
+    TimelineThreadData *thread = GetThisThreadData();
+
+    if (thread->disabled)
+        return NS_ERROR_NOT_AVAILABLE;
+
     va_start(args, text);
-
-    PR_CallOnce(&initonce, TimelineInit);
-
-    if (gTimelineDisabled)
-        return NS_ERROR_NOT_AVAILABLE;
-
-    TimelineThreadData *thread = GetThisThreadData();
-
-    if (thread->disabled)
-        return NS_ERROR_NOT_AVAILABLE;
-
     NS_TimelineMarkV(text, args);
+    va_end(args);
 
     return NS_OK;