[libvisio] fix endless loop with text fields in VSD6
David Tardon
dtardon at fedoraproject.org
Tue Jul 24 08:20:09 UTC 2012
commit 4f5e6c5456e01eae326523ea16dbdada5ce782d4
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jul 24 10:10:32 2012 +0200
fix endless loop with text fields in VSD6
...Fix-endless-loop-with-text-fields-in-VSD6.patch | 24 ++++++++++++++++++++
libvisio.spec | 7 +++++-
2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-endless-loop-with-text-fields-in-VSD6.patch b/0001-Fix-endless-loop-with-text-fields-in-VSD6.patch
new file mode 100644
index 0000000..0b63efb
--- /dev/null
+++ b/0001-Fix-endless-loop-with-text-fields-in-VSD6.patch
@@ -0,0 +1,24 @@
+From c3784a67af37d19af916771afa49b9a83ae7ac32 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba at bluewin.ch>
+Date: Tue, 24 Jul 2012 09:53:36 +0200
+Subject: [PATCH 1/2] Fix endless loop with text fields in VSD6
+
+---
+ src/lib/VSDXContentCollector.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/VSDXContentCollector.cpp b/src/lib/VSDXContentCollector.cpp
+index d1ae0b6..577afc3 100644
+--- a/src/lib/VSDXContentCollector.cpp
++++ b/src/lib/VSDXContentCollector.cpp
+@@ -2648,6 +2648,7 @@ void libvisio::VSDXContentCollector::appendCharacters(WPXString &text, const std
+ text.append(m_fields[m_fieldIndex++].cstr());
+ else
+ m_fieldIndex++;
++ ++iter;
+ }
+ else if (*iter < 0x20)
+ {
+--
+1.7.10.2
+
diff --git a/libvisio.spec b/libvisio.spec
index 235fdbf..b8d27f9 100644
--- a/libvisio.spec
+++ b/libvisio.spec
@@ -1,12 +1,13 @@
Name: libvisio
Version: 0.0.18
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A library providing ability to interpret and import visio diagrams
Group: System Environment/Libraries
License: GPLv2+ or LGPLv2+ or MPLv1.1
URL: http://www.freedesktop.org/wiki/Software/libvisio
Source: http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.xz
+Patch0: 0001-Fix-endless-loop-with-text-fields-in-VSD6.patch
BuildRequires: boost-devel
BuildRequires: doxygen
@@ -49,6 +50,7 @@ Currently supported: XHTML, raw.
%prep
%setup -q
+%patch0 -p1
%build
@@ -98,6 +100,9 @@ rm -f %{buildroot}/%{_libdir}/*.la
%changelog
+* Tue Jul 24 2012 David Tardon <dtardon at redhat.com> - 0.0.18-3
+- fix endless loop with text fields in VSD6
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.0.18-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list