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

[Caolán McNamara]

 hwpfilter/source/drawing.h  |    2 --
 hwpfilter/source/hiodev.cxx |    3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 6ca0958555f24e2a384740669adceb6cf3c7e3b8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 10 16:56:13 2017 +0100

    ofz#2899 increment pos before check, like all the other cases
    
    Change-Id: Id49f747e36f767a3e82fc3610959eb94015a93d7
    Reviewed-on: https://gerrit.libreoffice.org/40986
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

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 45ccb987bcd5..da02aadc800e 100644
--- a/hwpfilter/source/hiodev.cxx
+++ b/hwpfilter/source/hiodev.cxx
@@ -308,9 +308,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;