[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - hwpfilter/source

[Caolán McNamara]

 hwpfilter/source/hwpread.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit d269f530cc834507f205374727c20cc5992e2213
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 3 14:37:30 2017 +0100

    ofz#2846 null deref
    
    Change-Id: I88b61d7a4faaed118db8df6f99cef08310c1f2eb
    Reviewed-on: https://gerrit.libreoffice.org/40725
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index 90564df487b9..74edfda45845 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -428,6 +428,13 @@ bool Picture::Read(HWPFile & hwpf)
     UpdateBBox(this);
     if( pictype != PICTYPE_DRAW )
         style.cell = reserved3;
+    else
+    {
+        //picinfo.picun read above is unioned with
+        //picinfo.picdraw and so wrote to the hdo pointer
+        //value, which is definitely not useful to us
+        picinfo.picdraw.hdo = nullptr;
+    }
 
     if (follow_block_size != 0)
     {