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

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/ww8graf.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 24362462d78b31c0b7d4fcf6d63b2c9740823c9f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Apr 19 20:16:42 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Apr 20 10:53:40 2021 +0200

    ofz#33433 Heap-Buffer-overflow
    
    since...
    
    commit 531993161d6fe8065436191666cc88d7c4c20749
    Date:   Mon Apr 12 08:13:53 2021 +0200
    
        cid#1476017 Read_GrafLayer's subfunction params are never null
    
    Change-Id: Ic4fe55d92abbb0ba90abc70668fd6a837511240f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114307
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index 1bfc72100aef..c4ea188cf03f 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2516,8 +2516,7 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( tools::Long nGrafAnchorCp )
 
     WW8_FC nStartFc;
     void* pF0;
-    pPF->Get(nStartFc, pF0);
-    if (!pF0)
+    if (!pPF->Get(nStartFc, pF0))
     {
         OSL_ENSURE( false, "+Where is the graphic (2) ?" );
         return nullptr;