[SCM] Calligra suite packaging branch, master, updated. debian/2.4.3-1-18-g94e1ccc

[Adrien Grellier]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=19978a8

The following commit has been merged in the master branch:
commit 19978a8ebf15f81d9ad57b323f7aadaa7fa68f7c
Author: Adrien Grellier <adrien.grellier at laposte.net>
Date:   Tue Aug 21 11:02:39 2012 +0200

    remove patch not to write behind the allocated memory
---
 debian/patches/series                              |    1 -
 ...-not-to-write-behind-the-allocated-memory.patch |   31 --------------------
 2 files changed, 0 insertions(+), 32 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index b3003c0..7dc314a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 do_not_link_blas.diff
-upstream_Make-sure-not-to-write-behind-the-allocated-memory.patch
diff --git a/debian/patches/upstream_Make-sure-not-to-write-behind-the-allocated-memory.patch b/debian/patches/upstream_Make-sure-not-to-write-behind-the-allocated-memory.patch
deleted file mode 100644
index 2ece095..0000000
--- a/debian/patches/upstream_Make-sure-not-to-write-behind-the-allocated-memory.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7d72f7dd8d28d18c59a08a7d43bd4e0654043103 Mon Sep 17 00:00:00 2001
-From: Thorsten Zachmann <t.zachmann at zagge.de>
-Date: Sat, 4 Aug 2012 06:42:14 +0200
-Subject: [PATCH] Make sure not to write behind the allocated memory
-
-Validate the input data to not write behind the allocated memory. This fixes a
-buffer overflow found by Charlie Miller.
-(cherry picked from commit 8652ab672eaaa145dfb3782f5011de58aa4cc046)
----
- filters/words/msword-odf/wv2/src/styles.cpp |    5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/filters/words/msword-odf/wv2/src/styles.cpp b/filters/words/msword-odf/wv2/src/styles.cpp
-index c3132f0..0d691f5 100644
---- a/filters/words/msword-odf/wv2/src/styles.cpp
-+++ b/filters/words/msword-odf/wv2/src/styles.cpp
-@@ -248,6 +248,11 @@ throw(InvalidFormatException)
- #ifdef WV2_DEBUG_STYLESHEET
-         wvlog << "cbUPX: " << cbUPX << endl;
- #endif
-+        // do not overflow the allocated buffer grupx
-+        if (offset + cbUPX > grupxLen) {
-+            wvlog << "====> Error: grupx would overflow!" << endl;
-+            return false;
-+        }
-         for ( U16 j = 0; j < cbUPX; ++j ) {
-             grupx[ offset + j ] = stream->readU8();  // read the whole UPX
- #ifdef WV2_DEBUG_STYLESHEET
--- 
-1.7.10.4
-

-- 
Calligra suite packaging