diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-08-03 14:37:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-08-03 15:55:36 +0200 |
| commit | 9bee38c95b2c426d3c87a30d34172aca352f0141 (patch) | |
| tree | 84604b0152f1a4efa286abea98ad84cb39b1d491 /hwpfilter | |
| parent | 24817c26b3f8cc1a8156357316be442e5460a1a7 (diff) | |
ofz#2846 null deref
Change-Id: I88b61d7a4faaed118db8df6f99cef08310c1f2eb
Reviewed-on: https://gerrit.libreoffice.org/40724
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'hwpfilter')
| -rw-r--r-- | hwpfilter/source/hwpread.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx index 7e01d896581f..8b0c877c1f98 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) { |