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

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/ww8scan.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit ae3816bced5d39c0e28ad6fe241f529060493b30
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Aug 30 12:31:32 2021 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Aug 30 15:54:19 2021 +0200

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

diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index b8ea323e434d..d1ac0d4f4596 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -6966,7 +6966,10 @@ WW8Style::WW8Style(SvStream& rStream, WW8Fib& rFibPara)
 std::unique_ptr<WW8_STD> WW8Style::Read1STDFixed(sal_uInt16& rSkip)
 {
     if (m_rStream.remainingSize() < 2)
+    {
+        rSkip = 0;
         return nullptr;
+    }
 
     std::unique_ptr<WW8_STD> pStd;