[Libreoffice-commits] core.git: sfx2/source

Julien Nabet serval2412 at yahoo.fr
Sat Sep 7 10:02:00 PDT 2013


 sfx2/source/dialog/dinfdlg.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8277bbbfeddf2db4dd02c927b5d73f351e3656a0
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Sep 7 19:01:02 2013 +0200

    CID#1078580: Dereference after null check
    
    Change-Id: I822d9110132955b62e11373fc7cc773eacbf6740

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 8df6b84..46ff8b9 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -2599,11 +2599,11 @@ sal_Bool SfxCmisPropertiesPage::FillItemSet( SfxItemSet& rSet )
             pIter != changedProps.end( ); ++pIter )
                 aModifiedProps[ nCount++ ] = *pIter;
         pInfo->SetCmisProperties( aModifiedProps );
+        rSet.Put( *pInfo );
+        if ( bMustDelete )
+            delete pInfo;
     }
 
-    rSet.Put( *pInfo );
-    if ( bMustDelete )
-        delete pInfo;
     return modifiedNum;
 }
 


More information about the Libreoffice-commits mailing list