[libreoffice/f18] Resolves: rhbz#889342 crash when opening odp file

[David Tardon]

commit 7b9175616ee789a66edc4a34ab43455e83833b98
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Feb 6 13:02:08 2013 +0100

    Resolves: rhbz#889342 crash when opening odp file

 0001-valgrind-use-after-free.patch |   35 +++++++++++++++++++++++++++++++++++
 libreoffice.spec                   |    7 ++++++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/0001-valgrind-use-after-free.patch b/0001-valgrind-use-after-free.patch
new file mode 100644
index 0000000..2b3788d
--- /dev/null
+++ b/0001-valgrind-use-after-free.patch
@@ -0,0 +1,35 @@
+From 1c59d78cde9fcb8a43d7ff75db5d6fcf5f3c1d53 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Thu, 9 Aug 2012 10:34:50 +0100
+Subject: [PATCH] valgrind: use after free
+
+i.e. since b35980d9b
+
+seems remove, remove, delete was old pattern, new patterns ended up
+as remove+delete, remove. Reorder to remove, remove+delete
+
+Change-Id: I54ec8d0296e751110c516516465be2ac0615f6a1
+(cherry picked from commit 069caf79d716ba73d3281beb13fa2af67cac24f9)
+
+Signed-off-by: David Tardon <dtardon at redhat.com>
+---
+ editeng/source/editeng/editdoc.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
+index 110daf5..b062114 100644
+--- a/editeng/source/editeng/editdoc.cxx
++++ b/editeng/source/editeng/editdoc.cxx
+@@ -2693,8 +2693,8 @@ void CharAttribList::OptimizeRanges( SfxItemPool& rItemPool )
+                 if (*rNext.GetItem() == *rAttr.GetItem())
+                 {
+                     rAttr.GetEnd() = rNext.GetEnd();
+-                    aAttribs.erase(aAttribs.begin()+nNext);
+                     rItemPool.Remove(*rNext.GetItem());
++                    aAttribs.erase(aAttribs.begin()+nNext);
+                 }
+                 break;  // only 1 attr with same which can start here.
+             }
+-- 
+1.8.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 4b3f2af..5e4673c 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -44,7 +44,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        2%{?libo_prerelease}%{?dist}
+Release:        3%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -253,6 +253,7 @@ Patch32: 0001-rhbz-891082-CMXDocument-isSupported-catch-exceptions.patch
 %endif
 Patch33: 0001-these-ENABLE_FOOs-are-set-to-TRUE-not-YES.patch
 Patch34: 0001-fdo-59426-Don-t-try-to-repair-package-during-flat-de.patch
+Patch35: 0001-valgrind-use-after-free.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -999,6 +1000,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %endif
 %patch33 -p1 -b .these-ENABLE_FOOs-are-set-to-TRUE-not-YES.patch
 %patch34 -p1 -b .fdo59426-Don-t-try-to-repair-package-during-flat-de.patch
+%patch35 -p1 -b .valgrind-use-after-free.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2267,6 +2269,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Wed Feb 06 2013 David Tardon <dtardon at redhat.com> - 1:3.6.5.2-3
+- Resolves: rhbz#889342 crash when opening odp file
+
 * Tue Feb 05 2013 Caolán McNamara <caolanm at redhat.com> - 1:3.6.5.2-2
 - Resolves: rhbz#907112 presentation mode does not inhibit screen saver
 - Resolves: rhbz#862181 a .xlsx named as a .xls will fail to open