Bug 1308884 - clean return from functions that use variable number of arguments. r?bobbyholley
MozReview-Commit-ID: JXvNwPJyOvb
--- a/js/xpconnect/loader/mozJSComponentLoader.cpp
+++ b/js/xpconnect/loader/mozJSComponentLoader.cpp
@@ -160,39 +160,42 @@ ReportOnCallerUTF8(JSContext* callerCont
return NS_ERROR_FAILURE;
}
va_list ap;
va_start(ap, format);
char* buf = JS_vsmprintf(format, ap);
if (!buf) {
+ va_end(ap);
return NS_ERROR_OUT_OF_MEMORY;
}
JS_ReportErrorUTF8(callerContext, "%s", buf);
JS_smprintf_free(buf);
+ va_end(ap);
return NS_OK;
}
static nsresult
ReportOnCallerUTF8(JSCLContextHelper& helper,
const char* format, ...)
{
va_list ap;
va_start(ap, format);
char* buf = JS_vsmprintf(format, ap);
if (!buf) {
+ va_end(ap);
return NS_ERROR_OUT_OF_MEMORY;
}
helper.reportErrorAfterPop(buf);
-
+ va_end(ap);
return NS_OK;
}
mozJSComponentLoader::mozJSComponentLoader()
: mModules(16),
mImports(16),
mInProgressImports(16),
mInitialized(false),