core.git: Branch 'distro/collabora/co-24.04' - sw/source

[Caolán McNamara (via logerrit)]

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

New commits:
commit d9f17a4d35e62b17858cc0b03f5efec71186ccb5
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Dec 5 20:05:43 2024 +0000
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Dec 6 15:28:32 2024 +0100

    crashtesting: HLINK_MARK embedded null import from forum-mso-en4-7137.doc
    
    which causes problems on export to docx. Sanitize at the original
    import.
    
    Change-Id: I8b9fa86465c455fe872c41386889dc54e38eb9ec
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177907
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index cc50f8d76c17..4911a1841501 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -347,6 +347,8 @@ void SwWW8ImplReader::ReadEmbeddedData(SvStream& rStrm, 
SwDocShell const * pDocS
     if( ::get_flag( nFlags, WW8_HLINK_MARK ) )
     {
         xTextMark.reset(new 
OUString(read_uInt32_lenPrefixed_uInt16s_ToOUString(rStrm)));
+        if (clipToFirstNull(*xTextMark))
+            SAL_WARN("sw.ww8", "HLINK_MARK with embedded null, truncating to: 
" << *xTextMark);
     }
 
     if (!xLongName && xShortName)