[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa sw/source

Caolán McNamara caolanm at redhat.com
Fri Aug 21 08:17:55 PDT 2015


 sw/qa/core/data/ww6/pass/crash-3.doc |binary
 sw/source/filter/ww8/ww8par2.cxx     |    1 +
 2 files changed, 1 insertion(+)

New commits:
commit 72dbb1bb9c83f85050a892bc0886f0f2a56a3f51
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 21 13:04:57 2015 +0100

    fix another ww6 crash
    
    Change-Id: I47b4ffb1d96041d51dde313c080ed1d9cd4000be
    (cherry picked from commit 6405203750f7f779a3655bc5f415e8e0a2071d1b)
    Reviewed-on: https://gerrit.libreoffice.org/17898
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sw/qa/core/data/ww6/pass/crash-3.doc b/sw/qa/core/data/ww6/pass/crash-3.doc
new file mode 100644
index 0000000..8646b7a
Binary files /dev/null and b/sw/qa/core/data/ww6/pass/crash-3.doc differ
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 25d7839..16273ed 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -4325,6 +4325,7 @@ void WW8RStyle::ImportOldFormatStyles()
         {
             rSt.SeekRel(cbPapx-nByteCount);
             nByteCount += cbPapx-nByteCount;
+            break;
         }
 
         sal_uInt8 cb(0);


More information about the Libreoffice-commits mailing list