[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdecore/services
From:       Peter Kümmel <syntheticpp () yahoo ! com>
Date:       2009-11-13 13:40:50
Message-ID: 1258119650.806050.21766.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1048522 by kuemmel:

don't crash in release code

 M  +7 -1      kservicefactory.cpp  


--- trunk/KDE/kdelibs/kdecore/services/kservicefactory.cpp #1048521:1048522
@@ -32,7 +32,10 @@
 K_GLOBAL_STATIC(KSycocaFactorySingleton<KServiceFactory>, kServiceFactoryInstance)
 
 KServiceFactory::KServiceFactory()
-    : KSycocaFactory( KST_KServiceFactory )
+    : KSycocaFactory( KST_KServiceFactory ),
+    m_nameDict(0),
+    m_relNameDict(0),
+    m_menuIdDict(0)
 {
     kServiceFactoryInstance->instanceCreated(this);
     m_offerListOffset = 0;
@@ -41,6 +44,9 @@
     m_menuIdDictOffset = 0;
     if (!KSycoca::self()->isBuilding()) {
         QDataStream* str = stream();
+        Q_ASSERT(str);
+        if (!str) 
+            return;
         // Read Header
         qint32 i;
         (*str) >> i;
[prev in list] [next in list] [prev in thread] [next in thread]