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

Fix for bug 83607: too much backspace segfaults mozilla in textbox forms

Browse Source 
Prevent GetPriorNode() and GetNextNode() from traversing above root
node when aCurrentNode is the rootNode.

r=brade@netscape.com  sr=sfraser@netscape.com  a=asa@mozilla.org


git-svn-id: svn://10.0.0.236/trunk@101968 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kin%netscape.com
2001-08-29 21:33:52 +00:00
parent e954753b82
commit 6f9f127fbd
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/editor/base/nsEditor.cpp
View File

@@ -3211,6 +3211,15 @@ nsEditor::GetPriorNode(nsIDOMNode *aCurrentNode,
*aResultNode = nsnull; // init out-param
if (IsRootNode(aCurrentNode))
{
// Don't allow traversal above the root node! This helps
// prevent us from accidentally editing browser content
// when the editor is in a text widget.
return NS_OK;
}
// if aCurrentNode has a left sibling, return that sibling's rightmost child (or itself if it has no children)
nsCOMPtr<nsIDOMNode> prevSibling;
result = aCurrentNode->GetPreviousSibling(getter_AddRefs(prevSibling));
@@ -3300,7 +3309,16 @@ nsEditor::GetNextNode(nsIDOMNode *aCurrentNode,
if (!aCurrentNode || !aResultNode) { return NS_ERROR_NULL_POINTER; }
*aResultNode = nsnull; // init out-param
if (IsRootNode(aCurrentNode))
{
// Don't allow traversal above the root node! This helps
// prevent us from accidentally editing browser content
// when the editor is in a text widget.
return NS_OK;
}
// if aCurrentNode has a right sibling, return that sibling's leftmost child (or itself if it has no children)
nsCOMPtr<nsIDOMNode> nextSibling;
result = aCurrentNode->GetNextSibling(getter_AddRefs(nextSibling));

20
mozilla/editor/libeditor/base/nsEditor.cpp
View File

@@ -3211,6 +3211,15 @@ nsEditor::GetPriorNode(nsIDOMNode *aCurrentNode,
*aResultNode = nsnull; // init out-param
if (IsRootNode(aCurrentNode))
{
// Don't allow traversal above the root node! This helps
// prevent us from accidentally editing browser content
// when the editor is in a text widget.
return NS_OK;
}
// if aCurrentNode has a left sibling, return that sibling's rightmost child (or itself if it has no children)
nsCOMPtr<nsIDOMNode> prevSibling;
result = aCurrentNode->GetPreviousSibling(getter_AddRefs(prevSibling));
@@ -3300,7 +3309,16 @@ nsEditor::GetNextNode(nsIDOMNode *aCurrentNode,
if (!aCurrentNode || !aResultNode) { return NS_ERROR_NULL_POINTER; }
*aResultNode = nsnull; // init out-param
if (IsRootNode(aCurrentNode))
{
// Don't allow traversal above the root node! This helps
// prevent us from accidentally editing browser content
// when the editor is in a text widget.
return NS_OK;
}
// if aCurrentNode has a right sibling, return that sibling's leftmost child (or itself if it has no children)
nsCOMPtr<nsIDOMNode> nextSibling;
result = aCurrentNode->GetNextSibling(getter_AddRefs(nextSibling));