Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for bug 307245 (ASSERTION: FormatStringFromName() without format parameters: use GetStringFromName() instead: 'aParams && aLength' @ nsStringBundle::FormatStringFromName(). r/sr=jst.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@180910 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterv%propagandism.org
2005-09-24 17:38:20 +00:00
parent 6175cabb23
commit 974e8e14af
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/content/base/src/nsContentUtils.cpp
View File

@@ -2311,6 +2311,10 @@ nsContentUtils::ReportToConsole(PropertiesFile aFile,
PRUint32 aErrorFlags,
const char *aCategory)
{
NS_ASSERTION((aParams && aParamsLength) || (!aParams && !aParamsLength),
"Supply either both parameters and their number or no"
"parameters and 0.");
nsresult rv;
if (!sConsoleService) { // only need to bother null-checking here
rv = CallGetService(NS_CONSOLESERVICE_CONTRACTID, &sConsoleService);
@@ -2318,8 +2322,13 @@ nsContentUtils::ReportToConsole(PropertiesFile aFile,
}
nsXPIDLString errorText;
rv = FormatLocalizedString(aFile, aMessageName, aParams, aParamsLength,
errorText);
if (aParams) {
rv = FormatLocalizedString(aFile, aMessageName, aParams, aParamsLength,
errorText);
}
else {
rv = GetLocalizedString(aFile, aMessageName, errorText);
}
NS_ENSURE_SUCCESS(rv, rv);
nsCAutoString spec;