[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - idlc/source sw/source

[Pedro Giffuni]

 idlc/source/fehelper.cxx      |    2 +-
 sw/source/ui/docvw/romenu.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 36e754282d58c9028f4348dd543cb99a73220e99
Author: Pedro Giffuni <pfg at apache.org>
Date:   Sun Nov 29 23:57:30 2015 +0000

    Use after free
    
    After deleting a structure we shouldn't try to reuse it:
    return the vslue directly.
    
    CID:	440614

diff --git a/idlc/source/fehelper.cxx b/idlc/source/fehelper.cxx
index 4f756ac..479fd66 100644
--- a/idlc/source/fehelper.cxx
+++ b/idlc/source/fehelper.cxx
@@ -85,7 +85,7 @@ AstType const * FeDeclarator::compose(AstDeclaration const * pDecl)
             if ( (AstDeclaration*)pArray != pDecl2 )
             {
                 delete m_pComplexPart;
-                m_pComplexPart = pDecl2;
+                return (AstType*)pDecl2;
             }
         }
         return pArray;
commit 648ba742f8f3439efc3a0e215ad008fe66f8c855
Author: Pedro Giffuni <pfg at apache.org>
Date:   Sun Nov 29 22:56:45 2015 +0000

    initialize pState

diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index 4844363..4508052 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -226,7 +226,7 @@ SwReadOnlyPopup::SwReadOnlyPopup( const Point &rDPos, SwView &rV ) :
     Check( MN_READONLY_OPENURL,         SID_OPENDOC,        rDis );
     Check( MN_READONLY_OPENURLNEW,      SID_OPENDOC,        rDis );
 
-    SfxPoolItem* pState;
+    SfxPoolItem* pState = NULL;
 
     SfxItemState eState = pVFrame->GetBindings().QueryState( SID_COPY, pState );
     Check( MN_READONLY_COPY,            SID_COPY,           rDis );