[Libreoffice-commits] core.git: 2 commits - hwpfilter/source sw/source

[Caolán McNamara]

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

New commits:
commit 682f05f0b04f0f6949fbd220140964006dd7cbe6
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/40984
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/hwpfilter/source/drawing.h b/hwpfilter/source/drawing.h
index 4f990b0de813..0b8191a24a5b 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 4df1344ea8df..91477a265d72 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;
commit 35bac83ed2b5d48233c653cc7dc4eab5c234f7ac
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Aug 7 19:24:37 2017 +0100

    ofz#2877: crash in SVTB16Short
    
    sal_uInt16 wraparound
    
    Change-Id: Ifd791bdd5f1b96576fdd4ca6665bb972fb8b1e4c
    Reviewed-on: https://gerrit.libreoffice.org/40848
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 5d82f5d61706..726d2094c31f 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -3493,7 +3493,7 @@ bool WW8PLCFx_SEPX::Find4Sprms(sal_uInt16 nId1,sal_uInt16 nId2,sal_uInt16 nId3,s
     bool bFound = false;
 
     sal_uInt8* pSp = pSprms.get();
-    sal_uInt16 i=0;
+    size_t i = 0;
     while (i + maSprmParser.MinSprmLen() <= nSprmSiz)
     {
         // Sprm found?