anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-07 02:28:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prevent iconv exception in previews (#13042)

Browse Source 
The preview loader assumes all content is in the main document encoding.

As soon as content was not encodable, LyX crashed. We now check for that
and if non-encodable glyphs are found, we do not produce a preview snippet
and warn.

Ideally, the preview loader should be made aware of encoding changes, or
we should generally use utf8 for previews.
This commit is contained in:
Juergen Spitzmueller 2024-03-16 04:52:51 +01:00
parent 0fb7650786
commit b3fe9cb704
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/graphics/PreviewLoader.cpp
View File

@ -849,11 +849,30 @@ void PreviewLoader::Impl::dumpData(odocstream & os,
BitmapFile::const_iterator it = vec.begin(); BitmapFile::const_iterator it = vec.begin();
BitmapFile::const_iterator end = vec.end(); BitmapFile::const_iterator end = vec.end();
Encoding const & enc = buffer_.params().encoding();
for (; it != end; ++it) { for (; it != end; ++it) {
docstring res;
bool uncodable_content = false;
// check whether the content is encodable
// FIXME: the preview loader should be able
// to handle multiple encodings
// or we should generally use utf8
for (char_type n : from_utf8(it->first)) {
if (!enc.encodable(n)) {
LYXERR0("Uncodable character '"
<< docstring(1, n)
<< "' in preview snippet!");
uncodable_content = true;
} else
res += n;
}
// FIXME UNICODE // FIXME UNICODE
os << "\\begin{preview}\n" os << "\\begin{preview}\n";
<< from_utf8(it->first) // do not show incomplete preview
<< "\n\\end{preview}\n\n"; if (!uncodable_content)
os << res;
os << "\n\\end{preview}\n\n";
} }
} }