Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2747

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/2747/1

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

Change-Id: Ib5327fe5a88036f718f90cc0e05f287dc1573d03
(cherry picked from commit aa479a03390e9a779321fae26146cc1493cdf97c)
---
M libvisio/UnpackedTarball_visio.mk
A libvisio/libvisio-0.0.25.patch
2 files changed, 20 insertions(+), 0 deletions(-)



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_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)

-- 
To view, visit https://gerrit.libreoffice.org/2747
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5327fe5a88036f718f90cc0e05f287dc1573d03
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba <fridrich@documentfoundation.org>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.