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

Caolán McNamara caolanm at redhat.com
Thu Mar 13 03:51:18 PDT 2014


 framework/source/uielement/menubarmerger.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d575b23c187fb66bbe13c4fe6df8a8cb1ccbc135
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 13 10:50:11 2014 +0000

    coverity#705817 Dereference before null check
    
    Change-Id: Ia96b3e78b65ebea0d74267468906e9bda2ae3da6

diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx
index b814e77..f74a722 100644
--- a/framework/source/uielement/menubarmerger.cxx
+++ b/framework/source/uielement/menubarmerger.cxx
@@ -132,7 +132,7 @@ ReferencePathInfo MenuBarMerger::FindReferencePath(
         }
         i++;
     }
-    while (( pCurrMenu != 0 ) && ( i < nCount ) && ( eResult == RP_OK ));
+    while ((i < nCount) && (eResult == RP_OK));
 
     aResult.pPopupMenu = pCurrMenu;
     aResult.nPos       = nPos;


More information about the Libreoffice-commits mailing list