diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-03-15 13:51:20 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2013-03-18 10:17:08 +0000 |
| commit | 8e56096755668160dd569aab4be8563450e2d17d (patch) | |
| tree | 253a5fb5259c3bcfa26eb75c2e03181a57e34d16 | |
| parent | 51e669e5949b61cf50a8060cc925ec699933807c (diff) | |
Don't fail if the end of characters is reached after a field fdo#62299
Change-Id: Ib5327fe5a88036f718f90cc0e05f287dc1573d03
(cherry picked from commit aa479a03390e9a779321fae26146cc1493cdf97c)
Reviewed-on: https://gerrit.libreoffice.org/2747
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Tested-by: Petr Mladek <pmladek@suse.cz>
(cherry picked from commit b8efcf225f3f8fe57a8a6a46d397c90d04e7073d)
Reviewed-on: https://gerrit.libreoffice.org/2748
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Reviewed-by: Thorsten Behrens <tbehrens@suse.com>
Tested-by: Thorsten Behrens <tbehrens@suse.com>
| -rw-r--r-- | libvisio/UnpackedTarball_visio.mk | 6 | ||||
| -rw-r--r-- | libvisio/libvisio-0.0.25.patch | 14 |
2 files changed, 20 insertions, 0 deletions
diff --git a/libvisio/UnpackedTarball_visio.mk b/libvisio/UnpackedTarball_visio.mk index aa9113bafd6d..98313c170441 100644 --- a/libvisio/UnpackedTarball_visio.mk +++ b/libvisio/UnpackedTarball_visio.mk @@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio)) $(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: diff --git a/libvisio/libvisio-0.0.25.patch b/libvisio/libvisio-0.0.25.patch new file mode 100644 index 000000000000..6294548d1d8f --- /dev/null +++ b/libvisio/libvisio-0.0.25.patch @@ -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) |