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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Sun Aug 29 15:55:01 UTC 2021


 hwpfilter/source/hgzip.cxx   |    3 +++
 hwpfilter/source/hwpread.cxx |    2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 8d07df00118b5ac82880fdea000df350c3bf379c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Aug 29 15:56:31 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Aug 29 17:54:29 2021 +0200

    ofz: MemorySanitizer: use-of-uninitialized-value
    
    Change-Id: Ibe0f0307d939d8ce54ffdf54ae42948bfa22303a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121228
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/hwpfilter/source/hgzip.cxx b/hwpfilter/source/hgzip.cxx
index 56dc6268c273..ed8ef8a75f54 100644
--- a/hwpfilter/source/hgzip.cxx
+++ b/hwpfilter/source/hgzip.cxx
@@ -156,6 +156,9 @@ size_t gz_read(gz_stream * file, voidp buf, unsigned len)
     if (s == nullptr)
         return 0;
 
+    if (s->z_eof)
+        return 0;
+
     if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO)
         return 0;
     if (s->z_err == Z_STREAM_END)
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index 45d156b00399..d739e033f65b 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -502,8 +502,6 @@ bool Picture::Read(HWPFile & hwpf)
                 ishyper = true;
             }
         }
-        else
-            fprintf(stderr, "arse\n");
     }
 
     if( pictype != 3 )


More information about the Libreoffice-commits mailing list