diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-08-10 16:56:13 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-08-11 11:34:09 +0200 |
| commit | 1d2276429aac4975bde6cc2573cf944253cc4e4b (patch) | |
| tree | 0b605cbf69c971846a76bbc1e41a4a472bbea5d4 | |
| parent | 08ae774fe92f0576691c9b0177fef45d18fd77b3 (diff) | |
ofz#2899 increment pos before check, like all the other cases
Change-Id: Id49f747e36f767a3e82fc3610959eb94015a93d7
Reviewed-on: https://gerrit.libreoffice.org/40985
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
| -rw-r--r-- | hwpfilter/source/drawing.h | 2 | ||||
| -rw-r--r-- | hwpfilter/source/hiodev.cxx | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/hwpfilter/source/drawing.h b/hwpfilter/source/drawing.h index 1967ddffed1c..52a67be5365d 100644 --- a/hwpfilter/source/drawing.h +++ b/hwpfilter/source/drawing.h @@ -318,8 +318,6 @@ static bool LoadCommonHeader(HWPDrawingObject * hdo, unsigned short * link_info) static HWPDrawingObject *LoadDrawingObject(void) { - fprintf(stderr, "LoadDrawingObject\n"); - HWPDrawingObject *hdo, *head, *prev; unsigned short link_info; diff --git a/hwpfilter/source/hiodev.cxx b/hwpfilter/source/hiodev.cxx index cab73a626b8f..4d9fdce9196c 100644 --- a/hwpfilter/source/hiodev.cxx +++ b/hwpfilter/source/hiodev.cxx @@ -305,9 +305,10 @@ bool HMemIODev::setCompressed(bool ) bool HMemIODev::read1b(unsigned char &out) { + ++pos; if (pos <= length) { - out = ptr[pos++]; + out = ptr[pos - 1]; return true; } return false; |