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

Bug 170539 - prefs.js gets wiped. If we encounter an error in reading the prefs, it's possible to write out empty prefs. r=dveditz/sr=alecf

Browse Source
This commit is contained in:
ccarlen%netscape.com 2003-03-04 15:56:42 +00:00
parent 4f7267abed
commit b02c207dc0
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/libpref/src/nsPrefService.cpp
View File

@ -441,6 +441,12 @@ static nsresult openPrefFile(nsIFile* aFile, PRBool aIsErrorFatal,
return rv;
LL_L2UI(fileSize, llFileSize); // Converting 64 bit structure to unsigned int
// Now that we know the file exists, set this flag until we have
// successfully read and evaluated the prefs file. This will
// prevent us from writing an empty or partial prefs.js.
gErrorOpeningUserPrefs = aIsErrorFatal;
rv = NS_NewLocalFileInputStream(getter_AddRefs(inStr), aFile);
if (NS_FAILED(rv))
return rv;
@ -454,22 +460,21 @@ static nsresult openPrefFile(nsIFile* aFile, PRBool aIsErrorFatal,
PRUint32 amtRead = 0;
rv = inStr->Read(readBuf, fileSize, &amtRead);
NS_ASSERTION((amtRead == fileSize), "failed to read the entire prefs file!!");
if (amtRead != fileSize)
return NS_ERROR_FAILURE;
#ifdef XP_OS2 /* OS/2 workaround - our system editor adds an EOF character */
if (readBuf[amtRead - 1] == 0x1A) {
amtRead--;
}
#endif
if (NS_SUCCEEDED(rv)) {
if (!PREF_EvaluateConfigScript(readBuf, amtRead, nsnull, aIsGlobalContext, PR_TRUE,
if (PREF_EvaluateConfigScript(readBuf, amtRead, nsnull, aIsGlobalContext, PR_TRUE,
aSkipFirstLine))
{
gErrorOpeningUserPrefs = PR_FALSE;
else
rv = NS_ERROR_FAILURE;
if (aIsErrorFatal)
// If the user prefs file exists but generates an error,
// don't clobber the file when we try to save it
gErrorOpeningUserPrefs = PR_TRUE;
}
}
PR_Free(readBuf);
JS_EndRequest(gMochaContext);