[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-2' - libvisio/libvisio-0.0.25.patch libvisio/UnpackedTarball_visio.mk

[Fridrich Å trba]

 libvisio/UnpackedTarball_visio.mk |    6 ++++++
 libvisio/libvisio-0.0.25.patch    |   14 ++++++++++++++
 2 files changed, 20 insertions(+)

New commits:
commit 8e56096755668160dd569aab4be8563450e2d17d
Author: Fridrich Å trba <fridrich.strba at 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 <pmladek at suse.cz>
    Tested-by: Petr Mladek <pmladek at suse.cz>
    (cherry picked from commit b8efcf225f3f8fe57a8a6a46d397c90d04e7073d)
    Reviewed-on: https://gerrit.libreoffice.org/2748
    Reviewed-by: Michael Meeks <michael.meeks at suse.com>
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Reviewed-by: Thorsten Behrens <tbehrens at suse.com>
    Tested-by: Thorsten Behrens <tbehrens at suse.com>

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)