[SCM] KDE Graphics module packaging branch, master, updated. debian/4.4.5-1-10-g77aed17

[Pino Toscano]

The following commit has been merged in the master branch:
commit 77aed170c62917451eff880e6a0bd752319c4882
Author: Pino Toscano <pino at kde.org>
Date:   Fri Aug 27 15:41:52 2010 +0200

    Add patch 01_r1167826_CVE-2010-2575.diff to fix CVE-2010-2575.
---
 debian/changelog                              |    7 ++++-
 debian/patches/01_r1167826_CVE-2010-2575.diff |   33 +++++++++++++++++++++++++
 debian/patches/series                         |    1 +
 3 files changed, 40 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c659a72..8c09170 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
 kdegraphics (4:4.4.5-2) UNRELEASED; urgency=low
 
+  [ Modestas Vainius ]
   * Point debian/control Vcs fields to the new Git repository.
   * Fix mistake in Solid action predicate for kamera (Closes: #585717). Thanks
     to dju` <dju at elegiac.net> for the patch.
 
- -- Modestas Vainius <modax at debian.org>  Mon, 26 Jul 2010 23:24:35 +0300
+  [ Pino Toscano ]
+  * Import upstream revision r1167826 to fix CVE-2010-2575 in the plucker
+    backend of Okular.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 27 Aug 2010 15:35:55 +0200
 
 kdegraphics (4:4.4.5-1) unstable; urgency=low
 
diff --git a/debian/patches/01_r1167826_CVE-2010-2575.diff b/debian/patches/01_r1167826_CVE-2010-2575.diff
new file mode 100644
index 0000000..8ab49e0
--- /dev/null
+++ b/debian/patches/01_r1167826_CVE-2010-2575.diff
@@ -0,0 +1,33 @@
+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 c0ce4c3..e0cf021 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_solid_camera_predicate.diff
+01_r1167826_CVE-2010-2575.diff

-- 
KDE Graphics module packaging