Changeset 80

Timestamp:

Apr 6, 2006, 9:32:24 PM (19 years ago)

Author:

dmik

Message:

Fixed a trap after issuing exit() if a QAplication instance has been created on the stack in main() (see ticket:10 for more info).

File:

• trunk/src/kernel/qfont.cpp (modified) (2 diffs)

trunk/src/kernel/qfont.cpp

@@ -2933 +2933 @@
 const uint QFontCache::min_cost = 4*1024; // 4mb
 
+#if defined (Q_OS_OS2)
+
+// On OS/2, destructors of static objects in a DLL cannot use objects created
+// on the stack of the main thread when the application is being abnormally
+// terminated (exit(), DosExit(), DosKillProcess(), etc), because at a time when
+// these static destructors are called (from _DLL_InitTerm on most compilers,
+// including GCC and IBM VAC) the stack is most likely reused  by the DLL
+// termination code. Since QFontCache is a child of QApplication (which is
+// usually created as a local object inside the main() function) and wants to
+// use its parent during destruction, this becomes a real problem and causes a
+// guaranteed application trap during abnormal termination. The workaround is to
+// use atexit() instead. Note that this will only work for the exit() case
+// (on DosExit() or DosKillProcess(), the stdlib's exit list is not processed).
+
+static void cleanupFontCache()
+{
+    if (QFontCache::instance != 0)
+        delete QFontCache::instance;
+}
+
+#else
 static QSingleCleanupHandler<QFontCache> cleanup_fontcache;
-
+#endif
 
 QFontCache::QFontCache()
@@ -2942 +2963 @@
     Q_ASSERT( instance == 0 );
     instance = this;
+#if defined (Q_OS_OS2)
+    atexit( cleanupFontCache );
+#else
     cleanup_fontcache.set( &instance );
+#endif    
 }