dtardon pushed to libmwaw (master). "do not deref. end iterator"

[notifications at fedoraproject.org]

>From ffb0a2a4d551af6419c98cb74c2ce7c0b338cd3c Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon at redhat.com>
Date: Tue, 5 May 2015 14:39:04 +0200
Subject: do not deref. end iterator


diff --git a/0001-do-not-deref.-end-iterator.patch b/0001-do-not-deref.-end-iterator.patch
new file mode 100644
index 0000000..5d561b0
--- /dev/null
+++ b/0001-do-not-deref.-end-iterator.patch
@@ -0,0 +1,25 @@
+From e2758011b89f33e055ef8055c3b1c571c68abad8 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Tue, 5 May 2015 13:21:34 +0200
+Subject: [PATCH] do not deref. end iterator
+
+---
+ src/lib/RagTimeText.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/RagTimeText.cxx b/src/lib/RagTimeText.cxx
+index dae1507..e24bcd0 100644
+--- a/src/lib/RagTimeText.cxx
++++ b/src/lib/RagTimeText.cxx
+@@ -304,7 +304,7 @@ bool RagTimeText::readFontNames(MWAWEntry &entry)
+     }
+     input->seek(pos, librevenge::RVNG_SEEK_SET);
+     std::string name("");
+-    long nextPos=*pIt;
++    long nextPos=(pIt==posSet.end()) ? endPos : *pIt;
+     while (!input->isEnd() && input->tell()<nextPos) {
+       char c=(char) input->readULong(1);
+       if (c=='\0') break;
+-- 
+2.3.5
+
diff --git a/libmwaw.spec b/libmwaw.spec
index cd1ff4e..65ab7cb 100644
--- a/libmwaw.spec
+++ b/libmwaw.spec
@@ -16,6 +16,7 @@ BuildRequires: pkgconfig(librevenge-0.0)
 
 Patch0: 0001-ClarisWorks-AppleWorks-spreadsheet-do-not-remove-fir.patch
 Patch1: 0002-ClarisWors-AppleWorks-spreadsheet-Oops-correct-of-a-.patch
+Patch2: 0001-do-not-deref.-end-iterator.patch
 
 %description
 {name} is a library for import of old Mac documents. It supports many
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/libmwaw.git/commit/?h=master&id=ffb0a2a4d551af6419c98cb74c2ce7c0b338cd3c