summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-09-07 23:01:26 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2017-09-13 21:41:47 +0200
commitd34e0fdf23f88bb8f8b5db5e4318b3a706bd14fb (patch)
treec8df393511be2e4925ed374e376a137aa100c4bd
parent342a65bdb3ca3db19eb6b1244b6f866a0e526a86 (diff)
svtools: HTML import: don't put lone surrogates in OUString
The bytes "ed b3 b5" in fdo67610-1.doc (which, as the name indicates, is an HTML file) are converted to the lone UTF-16 surrogate "dcf5", which is inserted into SwTextNode and causes asserts later on. The actual encoding of the HTML document is probably GBK (at least VIM doesn't display any missing characters with that), but because it doesn't contain any indication of its encoding it's apparently imported as UTF-8; the ImplConvertUtf8ToUnicode() thinking a surrogate code point is valid even if the Java-compatible mode RTL_TEXTENCODING_JAVA_UTF8 is not specified is a bit of a surprise. [note: the master commit says "JSON-compatible mode" but i was confusing different text encoding perversions there] Change-Id: Idd788d9d461fed150171dd907439166f3075a834 (cherry picked from commit fc670f637d4271246691904fd649358ce2e7be59) Reviewed-on: https://gerrit.libreoffice.org/42100 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--svtools/source/svrtf/svparser.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index 947ef75a98f3..cb7174f519d2 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -423,7 +423,8 @@ sal_uInt32 SvParser<T>::GetNextChar()
while( 0 == nChars && !bErr );
}
- if ( ! rtl::isUnicodeCodePoint( c ) )
+ // Note: ImplConvertUtf8ToUnicode() may produce a surrogate!
+ if (!rtl::isUnicodeCodePoint(c) || rtl::isHighSurrogate(c) || rtl::isLowSurrogate(c))
c = '?' ;
if( bErr )