Kaydet (Commit) b8efcf22 authored tarafından Fridrich Štrba's avatar Fridrich Štrba Kaydeden (comit) Petr Mladek

Don't fail if the end of characters is reached after a field fdo#62299

Change-Id: Ib5327fe5a88036f718f90cc0e05f287dc1573d03
(cherry picked from commit aa479a03)
Reviewed-on: https://gerrit.libreoffice.org/2747Reviewed-by: 's avatarPetr Mladek <pmladek@suse.cz>
Tested-by: 's avatarPetr Mladek <pmladek@suse.cz>
üst e00ed926
...@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio)) ...@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio))
$(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL))) $(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,visio,1))
$(eval $(call gb_UnpackedTarball_add_patches,visio,\
libvisio/libvisio-0.0.25.patch \
))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -2920,10 +2920,8 @@ void libvisio::VSDContentCollector::appendCharacters(WPXString &text, const std:
while (true)
{
if (iter == characters.end())
- {
- fail = true;
break;
- }
+
uint16_t character = *iter++;
character |= (uint16_t)(*iter++) << 8;
if (character == 0xfffc)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment