libvisio/UnpackedTarball_visio.mk | 6 ++++++
libvisio/libvisio-0.0.25.patch | 14 ++++++++++++++
2 files changed, 20 insertions(+)
New commits:
commit b8efcf225f3f8fe57a8a6a46d397c90d04e7073d
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Fri Mar 15 13:51:20 2013 +0100
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 <pmla...@suse.cz>
Tested-by: Petr Mladek <pmla...@suse.cz>
diff --git a/libvisio/UnpackedTarball_visio.mk
b/libvisio/UnpackedTarball_visio.mk
index aa9113b..98313c1 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 0000000..6294548
--- /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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
