Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-03 23:30:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Be paranoid about the given indices and never return a null DOM from the paste (in success conditions). bug 335609, r+sr=jst

Browse Source
This commit is contained in:
mrbkap%gmail.com 2006-04-27 00:20:27 +00:00
parent a9de930a86
commit 177391dbad
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editor/libeditor/html/nsHTMLDataTransfer.cpp
View File

@ -2537,8 +2537,14 @@ nsresult nsHTMLEditor::CreateDOMFragmentFromPaste(const nsAString &aInputString,
res = StripFormattingNodes(*outFragNode, PR_TRUE);
NS_ENSURE_SUCCESS(res, res);
*outEndNode = *outStartNode = contextLeaf;
// If there was no context, then treat all of the data we did get as the
// pasted data.
if (contextLeaf)
*outEndNode = *outStartNode = contextLeaf;
else
*outEndNode = *outStartNode = *outFragNode;
*outStartOffset = 0;
// get the infoString contents
@ -2555,6 +2561,8 @@ nsresult nsHTMLEditor::CreateDOMFragmentFromPaste(const nsAString &aInputString,
while (num--)
{
(*outStartNode)->GetFirstChild(getter_AddRefs(tmp));
if (!tmp)
return NS_ERROR_FAILURE;
tmp.swap(*outStartNode);
}
@ -2562,6 +2570,8 @@ nsresult nsHTMLEditor::CreateDOMFragmentFromPaste(const nsAString &aInputString,
while (num--)
{
(*outEndNode)->GetLastChild(getter_AddRefs(tmp));
if (!tmp)
return NS_ERROR_FAILURE;
tmp.swap(*outEndNode);
}
}