Fix bug # 33664: UMR in bookmarks.

git-svn-id: svn://10.0.0.236/trunk@235658 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rjc%netscape.com 2007-09-12 17:47:43 +00:00
parent 6d35853261
commit 76638f0e26

View File

@ -611,9 +611,11 @@ BookmarkParser::ProcessLine(nsIRDFContainer *container, nsIRDFResource *nodeType
nsIRDFResource **bookmarkNode, nsString &line,
nsString &description, PRBool &inDescription, PRBool &isActiveFlag)
{
nsresult rv;
nsresult rv = NS_OK;
PRInt32 offset;
if (*bookmarkNode) *bookmarkNode = nsnull;
if (inDescription == PR_TRUE)
{
offset = line.FindChar('<');
@ -742,8 +744,9 @@ BookmarkParser::Parse(nsIRDFResource *aContainer, nsIRDFResource *nodeType)
line.Truncate();
DecodeBuffer(line, linePtr, aLength);
ProcessLine(container, nodeType, getter_AddRefs(bookmarkNode),
rv = ProcessLine(container, nodeType, getter_AddRefs(bookmarkNode),
line, description, inDescriptionFlag, isActiveFlag);
if (NS_FAILED(rv)) break;
}
}
else if (mInputStream)
@ -780,7 +783,7 @@ BookmarkParser::Parse(nsIRDFResource *aContainer, nsIRDFResource *nodeType)
}
if (NS_SUCCEEDED(rv))
{
ProcessLine(container, nodeType, getter_AddRefs(bookmarkNode),
rv = ProcessLine(container, nodeType, getter_AddRefs(bookmarkNode),
line, description, inDescriptionFlag, isActiveFlag);
}
}