diff options
| author | drochner <drochner@pkgsrc.org> | 2006-10-23 15:18:15 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2006-10-23 15:18:15 +0000 |
| commit | 08df1249952b6e0b8a099228fa99d89a550db3c0 (patch) | |
| tree | b8935c74894620cf54d5ef6ef2c2f366a46d6689 | |
| parent | c331716a2dff1590af78d20ec2b23f7a26e267c3 (diff) | |
| download | pkgsrc-08df1249952b6e0b8a099228fa99d89a550db3c0.tar.gz | |
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
| -rw-r--r-- | x11/qt3-libs/distinfo | 3 | ||||
| -rw-r--r-- | x11/qt3-libs/patches/patch-ja | 29 |
2 files changed, 1 insertions, 31 deletions
diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo index 5a16cd4070b..c0bf9375281 100644 --- a/x11/qt3-libs/distinfo +++ b/x11/qt3-libs/distinfo @@ -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-bc) = d8a84e1b66bf1953b53df57ae81d2c98cce69c41 SHA1 (patch-bd) = a116ecf305ee5b5338bf84cb908d695f3baea830 SHA1 (patch-ia) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 SHA1 (patch-ib) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950 -SHA1 (patch-ja) = c04be87cd4a8bb3b9f6f32ea37a11c1b15803a21 diff --git a/x11/qt3-libs/patches/patch-ja b/x11/qt3-libs/patches/patch-ja deleted file mode 100644 index 1a465562e0a..00000000000 --- a/x11/qt3-libs/patches/patch-ja +++ /dev/null @@ -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); |