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

Change-Id: Ib5327fe5a88036f718f90cc0e05f287dc1573d03
This commit is contained in:
Fridrich Štrba 2013-03-15 13:51:20 +01:00
parent cd98512fc4
commit aa479a0339
2 changed files with 20 additions and 0 deletions

View File

@ -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:

View File

@ -0,0 +1,14 @@
--- 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)