head 1.5; access; symbols pkgsrc-2017Q3:1.4.0.44 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.40 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.38 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.36 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.34 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.32 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.30 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.28 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.26 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.24 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.22 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.20 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.18 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.16 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.14 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.12 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.10 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.8 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.6 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.4 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.2 pkgsrc-2012Q3-base:1.4 pkgsrc-2011Q4:1.3.0.26 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.24 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.22 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.20 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.18 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.16 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.14 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.12 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.10 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.8 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.6 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.4 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.2 pkgsrc-2006Q4-base:1.3; locks; strict; comment @# @; 1.5 date 2017.09.26.10.27.22; author wiz; state dead; branches; next 1.4; commitid 9ARpkXTuh9Wg2H8A; 1.4 date 2012.07.15.14.30.36; author alnsn; state Exp; branches; next 1.3; 1.3 date 2006.10.23.15.18.15; author drochner; state dead; branches; next 1.2; 1.2 date 2006.10.23.14.54.11; author adam; state Exp; branches; next 1.1; 1.1 date 2006.10.19.12.58.12; author drochner; state Exp; branches; next ; desc @@ 1.5 log @*: remove qt3 and the packages using it, including KDE3 Announced in https://mail-index.netbsd.org/pkgsrc-users/2017/09/10/msg025556.html @ text @$NetBSD: patch-ja,v 1.4 2012/07/15 14:30:36 alnsn Exp $ Add missing #include for ptrdiff_t. --- include/qmap.h.orig 2007-02-02 14:01:05.000000000 +0000 +++ include/qmap.h @@@@ -47,6 +47,7 @@@@ #endif // QT_H #ifndef QT_NO_STL +#include #include #include #endif @ 1.4 log @Add missing #include for ptrdiff_t. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @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 @ text @d1 2 a2 1 $NetBSD: patch-ja,v 1.2 2006/10/23 14:54:11 adam Exp $ d4 4 a7 5 --- 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; d9 5 a13 21 + 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); @ 1.2 log @Changes 3.3.7: * Fixed security flaw in the way Qt handles pixmap images @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Add a patch for CVE-2006-4811 (integer overflow in image handling). The patch was proposed in http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=210742, but this is appearently not what Redhat does -- they have an update for kdelibs, but don't tell details. The patch helps for me, so put it in, at least until we know more. @ text @d3 1 a3 1 --- src/kernel/qpixmap_x11.cpp.orig 2006-10-19 13:06:42.000000000 +0200 d5 1 a5 1 @@@@ -1757,6 +1757,12 @@@@ QPixmap QPixmap::xForm( const QWMatrix & d18 1 a18 1 @@@@ -1866,6 +1872,11 @@@@ QPixmap QPixmap::xForm( const QWMatrix & @