[Libreoffice-commits] core.git: vcl/unx

[Stephan Bergmann]

 vcl/unx/generic/app/saldata.cxx |   25 +++++++++++--------------
 vcl/unx/gtk/app/gtkdata.cxx     |   11 +++++------
 2 files changed, 16 insertions(+), 20 deletions(-)

New commits:
commit ffea65915b9cc6d4f3c01f829552702654a040f9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Aug 23 12:03:45 2013 +0200

    rhbz#1000150: Do not call exit upon XIOError
    
    ...as done in _XIOError (libX11-1.6.0/src/XlibInt.c) after calling the XIOError
    handler function (either the one supplied with XSetIOErrorHandler or
    _XDefaultIOError), as that calls the atexit handlers, which can wreak havoc in
    unrelated threads that happen to be running in parallel, leading to arbitrary
    crashes.  So avoid that by always calling _exit already from our XIOError
    handler.
    
    The old code was careful to /not/ call _exit when the XIOError happened on any
    thread but the main one, but I do not see the sense of that---after all,
    _XIOError will inevitably call exit afterwards, so this cannot be a way to
    "ignore" XIOErrors from special threads (that are set up say for the sole
    purpose of trying out "known-shaky" activities without affecting the stability
    of the whole process).  And findings like comment 12 to
    <https://bugzilla.redhat.com/show_bug.cgi?id=831628#c12> "[abrt]
    libreoffice-core-3.5.4.2-1.fc17: ICEConnectionWorker thread still running during
    exit" ("it is very likely that this is not a normal exit from reaching the end
    of main, but rather some explicit call to exit from some error handling code")
    make it clear that we apparenly do suffer from such calls to _XIOError -> exit
    on non-main threads.
    
    I have no idea why vcl/unx/gtk has its own XIOErrorHdl that is substantially
    different from the vcl/unx/generic one, though.
    
    Change-Id: Ida7d407cf5f0fa4e719118cab5e725144ceb3a35

diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index 3d91586..9b5e200 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -307,22 +307,19 @@ int X11SalData::XErrorHdl( Display *pDisplay, XErrorEvent *pEvent )
 
 int X11SalData::XIOErrorHdl( Display * )
 {
-    if (::osl::Thread::getCurrentIdentifier() != Application::GetMainThreadIdentifier())
+    if (::osl::Thread::getCurrentIdentifier() == Application::GetMainThreadIdentifier())
     {
-        pthread_exit(NULL);
-        return 0;
+        /*  #106197# hack: until a real shutdown procedure exists
+         *  _exit ASAP
+         */
+        if( ImplGetSVData()->maAppData.mbAppQuit )
+            _exit(1);
+
+        // really bad hack
+        if( ! SessionManagerClient::checkDocumentsSaved() )
+            /* oslSignalAction eToDo = */ osl_raiseSignal (OSL_SIGNAL_USER_X11SUBSYSTEMERROR, NULL);
     }
 
-    /*  #106197# hack: until a real shutdown procedure exists
-     *  _exit ASAP
-     */
-    if( ImplGetSVData()->maAppData.mbAppQuit )
-        _exit(1);
-
-    // really bad hack
-    if( ! SessionManagerClient::checkDocumentsSaved() )
-        /* oslSignalAction eToDo = */ osl_raiseSignal (OSL_SIGNAL_USER_X11SUBSYSTEMERROR, NULL);
-
     std::fprintf( stderr, "X IO Error\n" );
     std::fflush( stdout );
     std::fflush( stderr );
@@ -331,7 +328,7 @@ int X11SalData::XIOErrorHdl( Display * )
      *  do apply here. Since there is nothing to be done after an XIO
      *  error we have to _exit immediately.
      */
-    _exit(0);
+    _exit(1);
     return 0;
 }
 
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 5ff5a80..0df6b10 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -513,12 +513,11 @@ XIOErrorHandler aOrigXIOErrorHandler = NULL;
 
 int XIOErrorHdl(Display *pDisplay)
 {
-    if (::osl::Thread::getCurrentIdentifier() != Application::GetMainThreadIdentifier())
-    {
-        pthread_exit(NULL);
-        return 0;
-    }
-    return aOrigXIOErrorHandler ? aOrigXIOErrorHandler(pDisplay) : 0;
+    if (aOrigXIOErrorHandler)
+        aOrigXIOErrorHandler(pDisplay);
+    _exit(1);
+        // avoid crashes in unrelated threads that still run while atexit
+        // handlers are in progress
 }
 
 GtkData::~GtkData()