Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 01:35:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1237831 - Use a non-format argument in LogMessageToConsole. r=jst

Browse Source
This commit is contained in:
Arthur Edelstein 2016-01-04 09:32:21 -08:00
parent 04d80f24bc
commit f022c23fcb
3 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dom/base/nsContentUtils.cpp
View File

@ -11,7 +11,6 @@
#include <algorithm> #include <algorithm>
#include <math.h> #include <math.h>
#include "prprf.h"
#include "DecoderTraits.h" #include "DecoderTraits.h"
#include "harfbuzz/hb.h" #include "harfbuzz/hb.h"
#include "imgICache.h" #include "imgICache.h"
@ -3525,7 +3524,7 @@ nsContentUtils::ReportToConsoleNonLocalized(const nsAString& aErrorText,
} }
void void
nsContentUtils::LogMessageToConsole(const char* aMsg, ...) nsContentUtils::LogMessageToConsole(const char* aMsg)
{ {
if (!sConsoleService) { // only need to bother null-checking here if (!sConsoleService) { // only need to bother null-checking here
CallGetService(NS_CONSOLESERVICE_CONTRACTID, &sConsoleService); CallGetService(NS_CONSOLESERVICE_CONTRACTID, &sConsoleService);
@ -3533,17 +3532,7 @@ nsContentUtils::LogMessageToConsole(const char* aMsg, ...)
return; return;
} }
} }
sConsoleService->LogStringMessage(NS_ConvertUTF8toUTF16(aMsg).get());
va_list args;
va_start(args, aMsg);
char* formatted = PR_vsmprintf(aMsg, args);
va_end(args);
if (!formatted) {
return;
}
sConsoleService->LogStringMessage(NS_ConvertUTF8toUTF16(formatted).get());
PR_smprintf_free(formatted);
} }
bool bool

4
dom/base/nsContentUtils.h
View File

@ -893,8 +893,8 @@ public:
uint32_t aLineNumber = 0, uint32_t aLineNumber = 0,
uint32_t aColumnNumber = 0); uint32_t aColumnNumber = 0);
static void LogMessageToConsole(const char* aMsg, ...); static void LogMessageToConsole(const char* aMsg);
/** /**
* Get the localized string named |aKey| in properties file |aFile|. * Get the localized string named |aKey| in properties file |aFile|.
*/ */

4
dom/workers/ServiceWorkerRegistrar.cpp
View File

@ -310,8 +310,8 @@ ServiceWorkerRegistrar::ReadData()
} }
if (!IsSupportedVersion(version)) { if (!IsSupportedVersion(version)) {
nsContentUtils::LogMessageToConsole( nsContentUtils::LogMessageToConsole(nsPrintfCString(
"Unsupported service worker registrar version: %s", version.get()); "Unsupported service worker registrar version: %s", version.get()).get());
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }