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

(215094) - fix a hang in Opera Preferences migration - when no color settings are present in Opera preferences file, do not copy uninitialized variables into buffer

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@153366 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ben%bengoodger.com 2004-02-29 02:18:44 +00:00
parent 67333208ff
commit 48c1def90f
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mozilla/browser/components/migration/src/nsOperaProfileMigrator.cpp
View File

@ -382,10 +382,7 @@ nsOperaProfileMigrator::CopyPreferences(PRBool aReplace)
lastSectionName = transform->sectionName;
if (transform->type == _OPM(COLOR)) {
char* colorString = (char*)malloc(sizeof(char) * 8);
if (!colorString)
return NS_ERROR_OUT_OF_MEMORY;
char* colorString = nsnull;
nsresult rv = ParseColor(parser, lastSectionName, &colorString);
if (NS_SUCCEEDED(rv)) {
transform->stringValue = colorString;
@ -393,7 +390,8 @@ nsOperaProfileMigrator::CopyPreferences(PRBool aReplace)
transform->prefHasValue = PR_TRUE;
transform->prefSetterFunc(transform, branch);
}
nsCRT::free(colorString);
if (colorString)
nsCRT::free(colorString);
}
else {
char* val = nsnull;
@ -421,7 +419,7 @@ nsOperaProfileMigrator::CopyPreferences(PRBool aReplace)
}
}
}
// Copy Proxy Settings
CopyProxySettings(parser, branch);
@ -433,7 +431,7 @@ nsOperaProfileMigrator::CopyPreferences(PRBool aReplace)
delete parser;
parser = nsnull;
return NS_OK;
}
@ -513,11 +511,18 @@ nsOperaProfileMigrator::GetInteger(nsINIParser* aParser,
nsresult
nsOperaProfileMigrator::ParseColor(nsINIParser* aParser, char* aSectionName, char** aResult)
{
nsresult rv;
PRInt32 r, g, b;
GetInteger(aParser, aSectionName, "Red", &r);
GetInteger(aParser, aSectionName, "Green", &g);
GetInteger(aParser, aSectionName, "Blue", &b);
rv |= GetInteger(aParser, aSectionName, "Red", &r);
rv |= GetInteger(aParser, aSectionName, "Green", &g);
rv |= GetInteger(aParser, aSectionName, "Blue", &b);
if (NS_FAILED(rv))
return NS_OK; // This Preference has no value. Bail now before we get in trouble.
*aResult = (char*)malloc(sizeof(char) * 8);
if (!*aResult)
return NS_ERROR_OUT_OF_MEMORY;
sprintf(*aResult, "#%02X%02X%02X", r, g, b);