[pkgsrc/trunk]: pkgsrc/x11/qt3-libs patch-ja did contain a fix against the pi...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9a8c79b7ddc1
branches:  trunk
changeset: 520584:9a8c79b7ddc1
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Mon Oct 23 15:18:15 2006 +0000

description:
patch-ja did contain a fix against the pixmap image security flaw;
it is superseded by a somewhat different version in official qt-3.3.7 now

diffstat:

 x11/qt3-libs/distinfo         |   3 +--
 x11/qt3-libs/patches/patch-ja |  29 -----------------------------
 2 files changed, 1 insertions(+), 31 deletions(-)

diffs (47 lines):

diff -r 00ffaf826302 -r 9a8c79b7ddc1 x11/qt3-libs/distinfo
--- a/x11/qt3-libs/distinfo     Mon Oct 23 15:01:26 2006 +0000
+++ b/x11/qt3-libs/distinfo     Mon Oct 23 15:18:15 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2006/10/23 14:54:11 adam Exp $
+$NetBSD: distinfo,v 1.41 2006/10/23 15:18:15 drochner Exp $
 
 SHA1 (qt-x11-free-3.3.7.tar.bz2) = 824a4a69f78450e0c32b6c4bca17ef5d07a3b58d
 RMD160 (qt-x11-free-3.3.7.tar.bz2) = 64924ae987799b580cbae1c644b877812b86bc1d
@@ -22,4 +22,3 @@
 SHA1 (patch-bd) = a116ecf305ee5b5338bf84cb908d695f3baea830
 SHA1 (patch-ia) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
 SHA1 (patch-ib) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
-SHA1 (patch-ja) = c04be87cd4a8bb3b9f6f32ea37a11c1b15803a21
diff -r 00ffaf826302 -r 9a8c79b7ddc1 x11/qt3-libs/patches/patch-ja
--- a/x11/qt3-libs/patches/patch-ja     Mon Oct 23 15:01:26 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-$NetBSD: patch-ja,v 1.2 2006/10/23 14:54:11 adam Exp $
-
---- src/kernel/qpixmap_x11.cpp.orig    2006-10-19 16:25:12.000000000 +0200
-+++ src/kernel/qpixmap_x11.cpp
-@@ -1766,6 +1766,12 @@ QPixmap QPixmap::xForm( const QWMatrix &
-       dbpl = ((w*bpp+31)/32)*4;
-     dbytes = dbpl*h;
- 
-+    if (dbytes != (long long) dbpl*h) { // Integer overflow detection
-+      QPixmap pm;
-+      pm.data->bitmap = data->bitmap;
-+      return pm;
-+    }
-+
- #if defined(QT_MITSHM)
-     if ( use_mitshm ) {
-       dptr = (uchar *)xshmimg->data;
-@@ -1875,6 +1881,11 @@ QPixmap QPixmap::xForm( const QWMatrix &
-               sptr = (uchar *) axi->data;
-               bpp  = axi->bits_per_pixel;
-               dbytes = dbpl * h;
-+              if (dbytes != (long long) dbpl*h) { // Integer overflow detection
-+                  QPixmap pm;
-+                  pm.data->bitmap = data->bitmap;
-+                  return pm;
-+              }
-               dptr = (uchar *) malloc(dbytes);
-               Q_CHECK_PTR( dptr );
-               memset(dptr, 0, dbytes);