[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.2_rc2-1-164-g10e447e
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 68ce1d850da7368a850891d7c4a8822ab4181267
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Wed Jan 9 16:49:00 2013 +0100
lp#1097811: STG_FREE sector locations rejected
diff --git a/changelog b/changelog
index 67eb407..11631c4 100644
--- a/changelog
+++ b/changelog
@@ -17,6 +17,7 @@ libreoffice (1:3.5.7-0ubuntu3) UNRELEASED; urgency=low
* backport Do not consider timestamp differences as corruption (LP: #1097748)
* backport sw: better fix for DOCX table import crash (LP: #1097760)
* backport crash in SwXTextDocument::getRendererCount (LP: #1097782)
+ * backport STG_FREE sector locations rejected (LP: #1097811)
-- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 08 Jan 2013 17:09:36 +0100
diff --git a/patches/lp-1097811-fdo-53909-STG_FREE-sector-locations-rejecte.diff b/patches/lp-1097811-fdo-53909-STG_FREE-sector-locations-rejecte.diff
new file mode 100644
index 0000000..65faa88
--- /dev/null
+++ b/patches/lp-1097811-fdo-53909-STG_FREE-sector-locations-rejecte.diff
@@ -0,0 +1,60 @@
+From 7e806b0a2db59eb461d80b2933baba95e93114ce Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Thu, 22 Nov 2012 22:29:11 +0000
+Subject: [PATCH 11/14] Resolves: fdo#53909 STG_FREE sector locations rejected
+
+(cherry picked from commit ef9f9b750eac2966634c385a2021716c4de0e4cd)
+
+Conflicts:
+ sot/source/sdstor/stgelem.cxx
+
+Change-Id: I6f71c7e3cfeeba8a76096d5be68838b8d401c580
+Reviewed-on: https://gerrit.libreoffice.org/1150
+Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
+Tested-by: Stephan Bergmann <sbergman@redhat.com>
+---
+ sot/source/sdstor/stgelem.cxx | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
+index 90f1e2d..e0d738a 100644
+--- a/sot/source/sdstor/stgelem.cxx
++++ b/sot/source/sdstor/stgelem.cxx
+@@ -191,6 +191,14 @@ static bool lcl_wontoverflow(short shift)
+ return shift >= 0 && shift < (short)sizeof(short) * 8 - 1;
+ }
+
++static bool isKnownSpecial(sal_Int32 nLocation)
++{
++ return (nLocation == STG_FREE ||
++ nLocation == STG_EOF ||
++ nLocation == STG_FAT ||
++ nLocation == STG_MASTER);
++}
++
+ // Perform thorough checks also on unknown variables
+ sal_Bool StgHeader::Check()
+ {
+@@ -202,8 +210,8 @@ sal_Bool StgHeader::Check()
+ && nFATSize > 0
+ && nTOCstrm >= 0
+ && nThreshold > 0
+- && ( nDataFAT == -2 || ( nDataFAT >= 0 && nDataFATSize > 0 ) )
+- && ( nMasterChain == -2 || nMasterChain >=0 )
++ && ( isKnownSpecial(nDataFAT) || ( nDataFAT >= 0 && nDataFATSize > 0 ) )
++ && ( isKnownSpecial(nMasterChain) || nMasterChain >=0 )
+ && nMaster >= 0;
+ }
+
+@@ -404,7 +412,7 @@ sal_Bool StgEntry::Load( const void* pFrom, sal_uInt32 nBufSize )
+ if (n > nMaxLegalStr)
+ return sal_False;
+
+- if ((nSize < 0 && cType != STG_STORAGE) || (nPage1 < 0 && nPage1 != -2))
++ if ((nSize < 0 && cType != STG_STORAGE) || (nPage1 < 0 && !isKnownSpecial(nPage1)))
+ {
+ // the size makes no sense for the substorage
+ // TODO/LATER: actually the size should be an unsigned value, but in this case it would mean a stream of more than 2Gb
+--
+1.7.10.4
+
diff --git a/patches/series b/patches/series
index 76d1a6e..8b0162b 100644
--- a/patches/series
+++ b/patches/series
@@ -52,3 +52,4 @@ lp-1097744-fdo-49517-Revert-fdo-46102-Load-Java-scripts-with-cl.diff
lp-1097748-fdo-49819-fdo-54609-Do-not-consider-timestamp-differ.diff
lp-1097760-rhbz-820283-fdo-55462-sw-better-fix-for-DOCX-table-i.diff
lp-1097782-rhbz-890080-crash-in-SwXTextDocument-getRendererCoun.diff
+lp-1097811-fdo-53909-STG_FREE-sector-locations-rejecte.diff
--
LibreOffice packaging repository
Reply to: