diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-07-24 09:49:23 +0200 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-07-24 09:50:53 +0200 |
commit | dbbc38c174e8a924e2f26b9c21c84cccd17b8d08 (patch) | |
tree | 0a21225db817bae76c628e602a36ec458001aa5b /libvisio | |
parent | f05a2ee6135b344142019e4becc55e9453dab668 (diff) |
Fix endless loop in libvisio with text fields in VSD6
Change-Id: I6aca4a6199adef986ef3de8593470eca1870a1f5
Diffstat (limited to 'libvisio')
-rw-r--r-- | libvisio/libvisio-0.0.18.patch | 10 | ||||
-rw-r--r-- | libvisio/makefile.mk | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/libvisio/libvisio-0.0.18.patch b/libvisio/libvisio-0.0.18.patch new file mode 100644 index 000000000000..7260eed731dc --- /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 a7abaa0423cd..a19c39444201 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 |