rpms/qt/devel qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch, 1.1, 1.2

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qt/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30419

Modified Files:
	qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch 
Log Message:
better version of the patch


qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch:
 qguieventdispatcher_glib.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qt/devel/qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch	29 Jun 2010 17:18:06 -0000	1.1
+++ qt-everywhere-opensource-src-4.6.3-glib_eventloop_nullcheck.patch	29 Jun 2010 17:38:28 -0000	1.2
@@ -1,13 +1,12 @@
-diff -up qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qapplication.cpp.grass qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qapplication.cpp
-diff -up qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp.grass qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp
---- qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp.grass	2010-06-01 21:03:15.000000000 -0500
-+++ qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp	2010-06-29 12:07:58.545073715 -0500
-@@ -177,6 +177,8 @@ QGuiEventDispatcherGlibPrivate::QGuiEven
-     memset(&x11EventSource->pollfd, 0, sizeof(GPollFD));
-     x11EventSource->flags = QEventLoop::AllEvents;
-     x11EventSource->q = 0;
-+    // workaround NULL dereference https://bugzilla.redhat.com/show_bug.cgi?id=498111#c59 -- Rex
-+    if (x11EventSource->d)
-     x11EventSource->d = 0;
+diff -up qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp.glib_eventloop_nullcheck qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp
+--- qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp.glib_eventloop_nullcheck	2010-06-01 21:03:15.000000000 -0500
++++ qt-everywhere-opensource-src-4.6.3/src/gui/kernel/qguieventdispatcher_glib.cpp	2010-06-29 12:32:48.268074623 -0500
+@@ -76,7 +76,7 @@ static gboolean x11EventSourcePrepare(GS
+     GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s);
+     return (XEventsQueued(X11->display, QueuedAfterFlush)
+             || (!(source->flags & QEventLoop::ExcludeUserInputEvents)
+-                && !source->d->queuedUserInputEvents.isEmpty()));
++                && source->d && !source->d->queuedUserInputEvents.isEmpty()));
+ }
  
-     g_source_attach(&x11EventSource->source, mainContext);
+ static gboolean x11EventSourceCheck(GSource *s)