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

fix hang that can result from pasting a null selection

Browse Source
This commit is contained in:
akkana%netscape.com 1999-03-29 22:02:36 +00:00
parent 32b54070f7
commit 48b49d453f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
widget/src/gtk/nsSelectionMgr.cpp
View File

@ -285,7 +285,7 @@ nsresult nsSelectionMgr::PasteTextBlocking(nsString *aPastedText)
#endif
// Now we need to wait until the callback comes in ...
// i is in case we get a runaway.
// i is in case we get a runaway (yuck).
for (int i=0; mBlocking == PR_TRUE && i < 10000; ++i)
{
gtk_main_iteration_do(TRUE);
@ -293,6 +293,9 @@ nsresult nsSelectionMgr::PasteTextBlocking(nsString *aPastedText)
mBlocking = PR_FALSE;
if (!mSelectionData.data)
return NS_ERROR_NOT_AVAILABLE;
*aPastedText = (char*)(mSelectionData.data);
g_free(mSelectionData.data);
mSelectionData.data = nsnull;
@ -314,6 +317,9 @@ void
nsSelectionMgr::SelectionReceiver (GtkWidget *aWidget,
GtkSelectionData *data)
{
mBlocking = PR_FALSE;
mSelectionData.data = nsnull;
if (data->length < 0)
{
#ifdef DEBUG_akkana
@ -329,7 +335,6 @@ nsSelectionMgr::SelectionReceiver (GtkWidget *aWidget,
mSelectionData.data = g_new(guchar, data->length + 1);
memcpy(mSelectionData.data, data->data, data->length);
mSelectionData.data[data->length] = '\0';
mBlocking = PR_FALSE;
return;
default: