summaryrefslogtreecommitdiff
path: root/libvisio
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2013-03-15 13:51:20 +0100
committerFridrich Štrba <fridrich.strba@bluewin.ch>2013-03-15 13:51:20 +0100
commitaa479a03390e9a779321fae26146cc1493cdf97c (patch)
tree5cf09087ee623f507ca32a5bfc54b7aa639ac50b /libvisio
parentcd98512fc4c1bf78bd49f674732811d828c5a2b1 (diff)
Don't fail if the end of characters is reached after a field fdo#62299
Change-Id: Ib5327fe5a88036f718f90cc0e05f287dc1573d03
Diffstat (limited to 'libvisio')
-rw-r--r--libvisio/UnpackedTarball_visio.mk6
-rw-r--r--libvisio/libvisio-0.0.25.patch14
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)