Attachment 206009 Details for Bug 368456

[patch] libqt4 patch

0220-no-x-recursion-in-xerrhandler.diff (text/plain), 1.72 KB, created by Lubos Lunak on 2008-04-03 13:06:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lubos Lunak

Created: 2008-04-03 13:06:58 UTC

Size: 1.72 KB

patch

obsolete

>qt-bugs@ issue : none yet
>Trolltech task ID : none yet
>bugs.kde.org number : none
>applied: no
>author: Lubos Lunak <l.lunak@kde.org>
>os: unix
>
>X error handler is not allowed to do X protocol requests. Therefore e.g. creating
>QDragManager instance should not be allowed in it, as it results in things like
>creating X pixmaps. See https://bugzilla.novell.com/show_bug.cgi?id=368456.
>
>--- src/gui/qdnd_x11.cpp.sav	2008-03-01 02:33:57.000000000 +0100
>+++ src/gui/qdnd_x11.cpp	2008-04-03 14:33:02.000000000 +0200
>@@ -1698,21 +1698,23 @@ void QDragManager::drop()
> 
> bool QX11Data::xdndHandleBadwindow()
> {
>-    QDragManager *manager = QDragManager::self();
>-    if (manager->object && qt_xdnd_current_target) {
>-        qt_xdnd_current_target = 0;
>-        qt_xdnd_current_proxy_target = 0;
>-        manager->object->deleteLater();
>-        manager->object = 0;
>-        delete xdnd_data.deco;
>-        xdnd_data.deco = 0;
>-        return true;
>+    if (qt_xdnd_current_target) { // avoid possibly on-demand creating the manager in X error handler
>+        QDragManager *manager = QDragManager::self();
>+        if (manager->object) {
>+            qt_xdnd_current_target = 0;
>+            qt_xdnd_current_proxy_target = 0;
>+            manager->object->deleteLater();
>+            manager->object = 0;
>+            xdnd_data.deco->deleteLater();
>+            xdnd_data.deco = 0;
>+            return true;
>+        }
>     }
>     if (qt_xdnd_dragsource_xid) {
>         qt_xdnd_dragsource_xid = 0;
>         if (qt_xdnd_current_widget) {
>             QDragLeaveEvent e;
>-            QApplication::sendEvent(qt_xdnd_current_widget, &e);
>+            QApplication::postEvent(qt_xdnd_current_widget, &e);
>             qt_xdnd_current_widget = 0;
>         }
>         return true;

Actions: View | Diff

Attachments on bug 368456: 206009