[libreoffice] Resolves: rhbz#855507 large ole2 compound files fail to load

[Caolán McNamara]

commit f9d3edc2bd0d23c021349ba1909053251978a355
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 11 21:07:57 2012 +0100

    Resolves: rhbz#855507 large ole2 compound files fail to load

 ...o-not-check-the-stored-DIFAT-sector-count.patch |   29 ++++++++++++++++++++
 libreoffice.spec                                   |    7 ++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/0001-Do-not-check-the-stored-DIFAT-sector-count.patch b/0001-Do-not-check-the-stored-DIFAT-sector-count.patch
new file mode 100644
index 0000000..7e68b46
--- /dev/null
+++ b/0001-Do-not-check-the-stored-DIFAT-sector-count.patch
@@ -0,0 +1,29 @@
+From 50d89530eee57afb890e2e65aac8a5b0f93a74a3 Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei.yoshida at gmail.com>
+Date: Wed, 15 Aug 2012 14:06:06 -0400
+Subject: [PATCH] Do not check the stored DIFAT sector count.
+
+Refer to this thread for details.
+http://lists.freedesktop.org/archives/libreoffice/2012-August/036852.html
+
+Change-Id: Id2115732a1e1bcd78c13445f5aaefe1ec7cfa0c2
+---
+ sot/source/sdstor/stgelem.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
+index 5fb3a09..dfcc28a 100644
+--- a/sot/source/sdstor/stgelem.cxx
++++ b/sot/source/sdstor/stgelem.cxx
+@@ -194,7 +194,7 @@ sal_Bool StgHeader::Check()
+             && nTOCstrm >= 0
+             && nThreshold > 0
+             && ( nDataFAT == -2 || ( nDataFAT >= 0 && nDataFATSize > 0 ) )
+-            && ( nMasterChain == -2 || ( nMasterChain >=0 && nMaster > 109 ) )
++            && ( nMasterChain == -2 || nMasterChain >=0 )
+             && nMaster >= 0;
+ }
+ 
+-- 
+1.7.11.4
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 79442dc..d109ee1 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -34,7 +34,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        3%{?libo_prerelease}%{?dist}
+Release:        4%{?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
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -171,6 +171,7 @@ Patch10: 0001-Resolves-rhbz-836937-insanely-slow-with-Zemberek-ins.patch
 Patch11: 0001-Resolves-rhbz-846775-Clipboard-must-be-disposed-befo.patch
 Patch13: 0001-Resolves-rhbz-842292-crash-in-calling-callback-whose.patch
 Patch14: 0001-Resolves-rhbz-855972-crash-on-switching-to-outline-v.patch
+Patch15: 0001-Do-not-check-the-stored-DIFAT-sector-count.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -781,6 +782,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch11 -p1 -b .rhbz-846775-Clipboard-must-be-disposed-befo.patch
 %patch13 -p1 -b .rhbz-842292-crash-in-calling-callback-whose.patch
 %patch14 -p1 -b .rhbz-855972-crash-on-switching-to-outline-v.patch
+%patch15 -p1 -b .Do-not-check-the-stored-DIFAT-sector-count.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2011,6 +2013,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Tue Sep 11 2012 Caolán McNamara <caolanm at redhat.com> - 1:3.6.1.2-4
+- Resolves: rhbz#855507 large ole2 compound files fail to load
+
 * Mon Sep 10 2012 Caolán McNamara <caolanm at redhat.com> - 1:3.6.1.2-3
 - Resolves: rhbz#855972 crash on switching to outline view