head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.42 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.40 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.38 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.36 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.34 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.32 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.30 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.28 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.26 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.24 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.22 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.20 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.18 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.16 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.14 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.12 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.10 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.8 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.6 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.4 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.2 pkgsrc-2005Q2-base:1.3; locks; strict; comment @# @; 1.3 date 2005.05.31.14.13.24; author markd; state dead; branches; next 1.2; 1.2 date 2005.05.01.04.35.40; author markd; state Exp; branches; next 1.1; 1.1 date 2005.04.12.11.00.03; author drochner; state Exp; branches; next ; desc @@ 1.3 log @Update to KDE 3.4.1 Changes: * kdecore: Fix in command-line argument handler for clicking on mailto urls while kontact was started with arguments * kdecore: Fix the support for Dante proxies * kdecore: Fix the "random resolver failure" problem * kdecore: Fix the support for the IPv6 Blacklist in ioslaves * kdeui: Fix "Change Icon" in the toolbar editor * khtml: Fix submitted position for scrolled imagemaps * khtml: Load external CSS style-sheet with correct charset * khtml: Apply CSS padding to tables * khtml: Improve PRE parsing * khtml: Fix links with WBR tags * khtml: Parse CSS3 pseudo-classes and pseudo-elements more strict * khtml: Fix document.all.item * khtml: Return meaningful HTMLTableCellElement::cellIndex() values * khtml: Unbreak setting of location.href on windows opened by windows.open() * khtml: Various crash fixes * khtml: Fixed infinite loop due to onChange from textareas * khtml: Fix crash in window.setTimeout when Javascript is disabled * khtml: Fix server-side-push handler to accept bugzilla sending "text/html; charset=utf-8" as Content-Type * khtml: Fix for MMB-pasting onto an empty konqueror window * kjs: Allow non-ascii letters in identifiers * kjs: More flexible date string parsing * kjs: Fixes in escape() and unescape() functions * kjs: Fixes in RegExp constructor * kssl: store SSL passwords in the KDE wallet and reuse as needed * kio: KZip: Fixed double-deletion bug when trying to write to a non-writable directory. * kio: Fix for print:/manager not embedding the right part in Konqueror * kio: Use correct window icon in Konqueror when showing trash:/ * kfile: Don't show edit dialog when drop-adding items to sidebar * kfile: If Shift is pressed when menu opens show 'Delete' instead of 'Trash' * kio-http: Prevent endless busy loop * kio-http: Massive speed improvement for deleting Webdav folders * kio-ftp: Try non-passive mode if passive mode fails * kio-ftp: Fix parsing of Netware FTP servers, so that files don't all appear with a lock (no permissions) * kutils: Fixed support for back ref \0 (entire matched text) @ text @$NetBSD: patch-dg,v 1.2 2005/05/01 04:35:40 markd Exp $ --- kimgio/xview.cpp.orig 2004-11-22 16:52:18.000000000 +1300 +++ kimgio/xview.cpp @@@@ -7,6 +7,7 @@@@ #include #include +#include #include #include @@@@ -15,6 +16,9 @@@@ #define BUFSIZE 1024 +static const int b_255_3[]= {0,85,170,255}, // index*255/3 + rg_255_7[]={0,36,72,109,145,182,218,255}; // index *255/7 + KDE_EXPORT void kimgio_xv_read( QImageIO *_imageio ) { int x=-1; @@@@ -50,10 +54,14 @@@@ KDE_EXPORT void kimgio_xv_read( QImageIO sscanf(str, "%d %d %d", &x, &y, &maxval); if (maxval != 255) return; + int blocksize = x*y; + if(x < 0 || y < 0 || blocksize < x || blocksize < y) + return; // now follows a binary block of x*y bytes. - int blocksize = x*y; - char *block = new char[ blocksize ]; + char *block = (char*) malloc(blocksize); + if(!block) + return; if (iodev->readBlock(block, blocksize) != blocksize ) { @@@@ -62,6 +70,10 @@@@ KDE_EXPORT void kimgio_xv_read( QImageIO // Create the image QImage image( x, y, 8, maxval + 1, QImage::BigEndian ); + if( image.isNull()) { + free(block); + return; + } // how do the color handling? they are absolute 24bpp // or at least can be calculated as such. @@@@ -69,29 +81,9 @@@@ KDE_EXPORT void kimgio_xv_read( QImageIO for ( int j = 0; j < 256; j++ ) { -// ----------- OLIVER EIDEN -// That is the old-code ! -/* r = ((int) ((j >> 5) & 0x07)) << 5; - g = ((int) ((j >> 2) & 0x07)) << 5; - b = ((int) ((j >> 0) & 0x03)) << 6;*/ - - -// That is the code-how xv, decode 3-3-2 pixmaps, it is slighly different, -// but yields much better visuals results -/* r = (((int) ((j >> 5) & 0x07)) *255) / 7; - g = (((int) ((j >> 2) & 0x07)) *255) / 7; - b = (((int) ((j >> 0) & 0x03)) *255) / 3;*/ - -// This is the same as xv, with multiplications/divisions replaced by indexing - -// Look-up table to avoid multiplications and divisons - static int b_255_3[]= {0,85,170,255}, // index*255/3 - rg_255_7[]={0,36,72,109,145,182,218,255}; // index *255/7 - r = rg_255_7[((j >> 5) & 0x07)]; g = rg_255_7[((j >> 2) & 0x07)]; b = b_255_3[((j >> 0) & 0x03)]; -// --------------- image.setColor( j, qRgb( r, g, b ) ); } @@@@ -104,7 +96,7 @@@@ KDE_EXPORT void kimgio_xv_read( QImageIO _imageio->setImage( image ); _imageio->setStatus( 0 ); - delete [] block; + free(block); return; } @ 1.2 log @Apply the official KDE patches for CAN-2005-1046. http://www.kde.org/info/security/advisory-20050421-1.txt Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-dg,v 1.1 2005/04/12 11:00:03 drochner Exp $ @ 1.1 log @fix buffer overflow by corrupt PCX files, leading to crashes or code injection, see http://bugs.kde.org/show_bug.cgi?id=102328 bump PKGREVISION @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- kimgio/xview.cpp.orig 2004-11-22 04:52:18.000000000 +0100 d5 36 a40 1 @@@@ -62,6 +62,8 @@@@ KDE_EXPORT void kimgio_xv_read( QImageIO d44 2 a45 1 + if( image.isNull()) d47 1 d51 39 @