[Libreoffice-commits] .: Branch 'libreoffice-3-6' - libvisio/libvisio-0.0.18.patch libvisio/makefile.mk

[Miklos Vajna]

 libvisio/libvisio-0.0.18.patch |   10 ++++++++++
 libvisio/makefile.mk           |    3 +++
 2 files changed, 13 insertions(+)

New commits:
commit b6ac34cc5f19670ec148c94906c710f4f06950e0
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Jul 24 09:49:23 2012 +0200

    Fix endless loop in libvisio with text fields in VSD6
    
    Change-Id: I6aca4a6199adef986ef3de8593470eca1870a1f5
    (cherry picked from commit dbbc38c174e8a924e2f26b9c21c84cccd17b8d08)
    
    Signed-off-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/libvisio/libvisio-0.0.18.patch b/libvisio/libvisio-0.0.18.patch
new file mode 100644
index 0000000..7260eed
--- /dev/null
+++ b/libvisio/libvisio-0.0.18.patch
@@ -0,0 +1,10 @@
+--- misc/libvisio-0.0.18/src/lib/VSDXContentCollector.cpp	2012-06-22 08:48:16.000000000 +0200
++++ misc/build/libvisio-0.0.18/src/lib/VSDXContentCollector.cpp	2012-07-24 09:47:01.195105586 +0200
+@@ -2648,6 +2648,7 @@
+         text.append(m_fields[m_fieldIndex++].cstr());
+       else
+         m_fieldIndex++;
++	  ++iter;
+     }
+     else if (*iter < 0x20)
+     {
diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
index a7abaa0..a19c394 100644
--- a/libvisio/makefile.mk
+++ b/libvisio/makefile.mk
@@ -57,6 +57,9 @@ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpg
 TARFILE_NAME=libvisio-0.0.18
 TARFILE_MD5=a9a1db27688bad49418667b434d29c1f
 
+PATCH_FILES=\
+	$(TARFILE_NAME).patch
+
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src$/lib