[SCM] KDE Graphics module packaging branch, kde4.5, updated. debian/4.4.5-2-4-g9072103

[George Kiagiadakis]

The following commit has been merged in the kde4.5 branch:
commit e315d387832f516c2bd697c920c4856fce59a870
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Fri Sep 3 15:32:31 2010 +0300

    Remove patch 01_r1167826_CVE-2010-2575.diff; applied upstream.
---
 debian/changelog                              |    1 +
 debian/patches/01_r1167826_CVE-2010-2575.diff |   33 -------------------------
 debian/patches/series                         |    1 -
 3 files changed, 1 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 873ecfa..3989ec3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kdegraphics (4:4.5.1-0r1) UNRELEASED; urgency=low
 
   [ George Kiagiadakis ]
   * Add myself to uploaders.
+  * Remove patch 01_r1167826_CVE-2010-2575.diff; applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 03 Sep 2010 15:13:33 +0300
 
diff --git a/debian/patches/01_r1167826_CVE-2010-2575.diff b/debian/patches/01_r1167826_CVE-2010-2575.diff
deleted file mode 100644
index 8ab49e0..0000000
--- a/debian/patches/01_r1167826_CVE-2010-2575.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: fix CVE-2010-2575
-Origin: vendor, http://websvn.kde.org/?view=rev&revision=1167826
-
-Index: kdegraphics/okular/generators/plucker/unpluck/image.cpp
-===================================================================
---- kdegraphics/okular/generators/plucker/unpluck/image.cpp	(revision 1167825)
-+++ kdegraphics/okular/generators/plucker/unpluck/image.cpp	(revision 1167826)
-@@ -289,8 +289,23 @@
-             for (j = 0; j < bytes_per_row;) {
-                 incount = *palm_ptr++;
-                 inval = *palm_ptr++;
--                memset (rowbuf + j, inval, incount);
--                j += incount;
-+                if (incount + j <= bytes_per_row  * width)
-+                {
-+                    memset (rowbuf + j, inval, incount);
-+                    j += incount;
-+                }
-+                else
-+                {
-+                    free (rowbuf);
-+                    free (lastrow);
-+                    free (jpeg_row);
-+
-+                    jpeg_destroy_compress (&cinfo);
-+
-+                    fclose( outfile );
-+
-+                    return false;
-+                }
-             }
-         }
-         else if ((flags & PALM_IS_COMPRESSED_FLAG)
diff --git a/debian/patches/series b/debian/patches/series
index e0cf021..c0ce4c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 fix_solid_camera_predicate.diff
-01_r1167826_CVE-2010-2575.diff

-- 
KDE Graphics module packaging