wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix for bug #408463: top crash @ nsAutoCompleteController::RevertTextValue() and nsAutoCompleteController::HandleKeyNavigation() r=mano, a=blocking-firefox-3+

Browse Source
This commit is contained in:
sspitzer@mozilla.org 2007-12-26 20:52:38 -08:00
parent ef5983668a
commit 6c0508e137
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
toolkit/components/autocomplete/src/nsAutoCompleteController.cpp
View File

@ -491,12 +491,19 @@ nsAutoCompleteController::HandleKeyNavigation(PRUint32 aKey, PRBool *_retval)
ClearSearchTimer();
ClosePopup();
}
// Update last-searched string to the current input, since the input may
// have changed. Without this, subsequent backspaces look like text
// additions, not text deletions.
nsAutoString value;
mInput->GetTextValue(value);
mSearchString = value;
// mInput may be null, see bug #408463 and bug #409902
if (mInput) {
// Update last-searched string to the current input, since the input may
// have changed. Without this, subsequent backspaces look like text
// additions, not text deletions.
nsAutoString value;
mInput->GetTextValue(value);
mSearchString = value;
}
else
NS_WARNING("unexpected, please comment in bug #409902");
}
return NS_OK;
@ -1159,6 +1166,12 @@ nsAutoCompleteController::EnterMatch()
nsresult
nsAutoCompleteController::RevertTextValue()
{
// StopSearch() can call PostSearchCleanup() which might result
// in a blur event, which could null out mInput, so we need to check it
// again. See bug #408463 for more details
if (!mInput)
return NS_OK;
nsAutoString oldValue(mSearchString);
PRBool cancel = PR_FALSE;