diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-05-15 17:59:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-05-16 09:57:23 +0200 |
| commit | dfd517af96c61b6bef75dde525f60bdd2a29a1a9 (patch) | |
| tree | c361fff31ec77cafcc26246eebf83d28b9e05817 | |
| parent | enable libc++ debug mode again if available (diff) | |
| download | core-dfd517af96c61b6bef75dde525f60bdd2a29a1a9.tar.gz core-dfd517af96c61b6bef75dde525f60bdd2a29a1a9.zip | |
ofz#47473 OOM just skip the unused "reserved" data on read
and don't store it
Change-Id: I7e68111b5ed724c5eab9e8040b8c28f542064ae5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134353
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | hwpfilter/source/hinfo.cxx | 3 | ||||
| -rw-r--r-- | hwpfilter/source/hinfo.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/hwpfilter/source/hinfo.cxx b/hwpfilter/source/hinfo.cxx index f842f0d683ff..505936b92aae 100644 --- a/hwpfilter/source/hinfo.cxx +++ b/hwpfilter/source/hinfo.cxx @@ -267,7 +267,6 @@ CharShape::CharShape() , color{0} , shade(0) , attr(0) - , reserved{0} { } @@ -283,7 +282,7 @@ void CharShape::Read(HWPFile & hwpf) hwpf.ReadBlock(color, 2); hwpf.Read1b(shade); hwpf.Read1b(attr); - hwpf.ReadBlock(reserved, 4); + hwpf.SkipBlock(4); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/hwpfilter/source/hinfo.h b/hwpfilter/source/hinfo.h index 57067646c856..003dafc0d308 100644 --- a/hwpfilter/source/hinfo.h +++ b/hwpfilter/source/hinfo.h @@ -225,7 +225,6 @@ struct CharShape unsigned char color[2]; unsigned char shade; unsigned char attr; - unsigned char reserved[4]; void Read(HWPFile &); |