summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolan.mcnamara@collabora.com>2024-12-05 20:05:43 +0000
committerMichael Stahl <michael.stahl@allotropia.de>2024-12-06 11:42:44 +0100
commit5e84620b1a5a60e14da0da942c87a86326ae6dae (patch)
treecb0c0fb6a449048c8a11100db9dfeeaab91f66f5
parent84e531c09ada41a1373a629799aef18e229158ac (diff)
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/+/177905 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
-rw-r--r--sw/source/filter/ww8/ww8par.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 2ed6ce9fd383..7d0e6c4c0233 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)