diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2021-05-31 21:12:12 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-06-04 15:46:51 +0200 |
| commit | 7836f2d4d0a4deb0a9a9bf240ec29fc934356d40 (patch) | |
| tree | ac6496e955d9da02f79f5c30be337a0c017f6d4a /writerfilter/source/rtftok | |
| parent | f1e3d036500aab8560adacd98095dc80195a471f (diff) | |
tdf#142325 RTF import: tolerate invalid hex markup like "\'3?"
The RTF spec says \'hh is the expected form, where both "h" are 0-9, a-f
or A-F. But Word accepts the bugdoc, so don't reject this input, handle
\'<number><junk> as \'0<number>.
At least the current case ignores the actual value, as it's a single
character to provide a non-unicode value after \uN for old readers that
don't support Unicode.
Change-Id: Ib61247ab08278ca5012cc887cee26c7571c29fc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116499
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
(cherry picked from commit 6fc8a6b0b52509d735971f079d7b1660559d475d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116457
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'writerfilter/source/rtftok')
| -rw-r--r-- | writerfilter/source/rtftok/rtftokenizer.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx index bfd29c38f118..b205227b94e3 100644 --- a/writerfilter/source/rtftok/rtftokenizer.cxx +++ b/writerfilter/source/rtftok/rtftokenizer.cxx @@ -144,11 +144,16 @@ RTFError RTFTokenizer::resolveParse() else { SAL_INFO("writerfilter.rtf", __func__ << ": hex internal state"); - b = b << 4; - sal_Int8 parsed = msfilter::rtfutil::AsHex(ch); - if (parsed == -1) - return RTFError::HEX_INVALID; - b += parsed; + // Assume that \'<number><junk> means \'0<number>. + if (rtl::isAsciiDigit(static_cast<unsigned char>(ch)) + || (ch >= 'a' && ch <= 'f') || (ch >= 'A' && ch <= 'F')) + { + b = b << 4; + sal_Int8 parsed = msfilter::rtfutil::AsHex(ch); + if (parsed == -1) + return RTFError::HEX_INVALID; + b += parsed; + } count--; if (!count) { |