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

List:       kde-commits
Subject:    KDE/kdebase/workspace/kcontrol/kfontinst/kfontinst
From:       Stephan Kulow <coolo () kde ! org>
Date:       2006-04-18 19:53:23
Message-ID: 1145390003.671988.15193.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 531238 by coolo:

don't access after delete (CID 1232)


 M  +5 -1      Main.cpp  


--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/kfontinst/Main.cpp #531237:531238
@@ -118,14 +118,18 @@
             if(!xfsConfigFile.isEmpty() && xcfg->xfsInPath())
             {
                 delete xcfg;
+		xcfg=0;
                 xfs=true;
             }
         }
 
         // OK, if still set to X11 config, but this mentions fontconfig FPE, then \
delete - as we're not interested  // anymore...
-        if(xcfg && xcfg->fcInPath())
+        if(xcfg && xcfg->fcInPath()) 
+	{
             delete xcfg;
+	    xcfg = 0;
+	}
 
         return xfs ? new KFI::CXConfig(KFI::CXConfig::XFS, xfsConfigFile) : xcfg;
     }


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