The following commit has been merged in the debian-experimental-3.6 branch:
commit 00d9f94bcdbdf65d4da29a51cf3c615575ba2925
Author: Rene Engelhard <[email protected]>
Date: Fri Jul 20 21:35:58 2012 +0200
oops, remove obsolete patch...
diff --git a/patches/CVE-2012-2334-clip-max-entries.diff
b/patches/CVE-2012-2334-clip-max-entries.diff
deleted file mode 100644
index c27939d..0000000
--- a/patches/CVE-2012-2334-clip-max-entries.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From 63dbfa8386159c2f22b7e3ef786f3c93fd4217aa Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <[email protected]>
-Date: Mon, 28 May 2012 15:13:09 +0000
-Subject: clip max entries
-
-Signed-off-by: Petr Mladek <[email protected]>
----
-diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
-index 3107635..56234e2 100644
---- a/filter/source/msfilter/msdffimp.cxx
-+++ b/filter/source/msfilter/msdffimp.cxx
-@@ -6049,6 +6049,9 @@ void SvxMSDffManager::GetFidclData( sal_uInt32 nOffsDggL
)
- "escher", "FIDCL list longer than remaining bytes,
ppt or parser is wrong");
- mnIdClusters = std::min(nMaxEntriesPossible,
static_cast<sal_Size>(mnIdClusters));
-
-+ sal_Size nMaxEntriesAllocatable = SAL_MAX_INT32 /
sizeof(FIDCL);
-+ mnIdClusters = std::min(nMaxEntriesAllocatable,
static_cast<sal_Size>(mnIdClusters));
-+
- mpFidcls = new FIDCL[ mnIdClusters ];
- memset(mpFidcls, 0, mnIdClusters * sizeof(FIDCL));
- for (sal_uInt32 i = 0; i < mnIdClusters; ++i)
---
-cgit v0.9.0.2-2-gbebe
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
