head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.42 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.40 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.38 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.36 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.34 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.32 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.30 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.28 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.26 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.24 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.22 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.20 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.18 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.16 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.14 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.12 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.10 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.8 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.6 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.4 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.2 pkgsrc-2005Q2-base:1.2; locks; strict; comment @# @; 1.2 date 2005.05.31.14.13.24; author markd; state dead; branches; next 1.1; 1.1 date 2005.05.01.04.35.40; author markd; state Exp; branches; next ; desc @@ 1.2 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-dj,v 1.1 2005/05/01 04:35:40 markd Exp $ --- kimgio/psd.cpp.orig 2004-12-16 22:59:07.000000000 +1300 +++ kimgio/psd.cpp @@@@ -66,6 +66,19 @@@@ namespace { // Private. s >> header.color_mode; return s; } + static bool seekBy(QDataStream& s, unsigned int bytes) + { + char buf[4096]; + while (bytes) { + unsigned int num= QMIN(bytes,sizeof(buf)); + unsigned int l = num; + s.readRawBytes(buf, l); + if(l != num) + return false; + bytes -= num; + } + return true; + } // Check that the header is a valid PSD. static bool IsValid( const PSDHeader & header ) @@@@ -149,10 +162,8 @@@@ namespace { // Private. if( compression ) { // Skip row lengths. - ushort w; - for(uint i = 0; i < header.height * header.channel_count; i++) { - s >> w; - } + if(!seekBy(s, header.height*header.channel_count*sizeof(ushort))) + return false; // Read RLE data. for(uint channel = 0; channel < channel_num; channel++) { @@@@ -162,6 +173,8 @@@@ namespace { // Private. uint count = 0; while( count < pixel_count ) { uchar c; + if(s.atEnd()) + return false; s >> c; uint len = c; @@@@ -169,6 +182,9 @@@@ namespace { // Private. // Copy next len+1 bytes literally. len++; count += len; + if ( count > pixel_count ) + return false; + while( len != 0 ) { s >> *ptr; ptr += 4; @@@@ -181,6 +197,8 @@@@ namespace { // Private. len ^= 0xFF; len += 2; count += len; + if(s.atEnd() || count > pixel_count) + return false; uchar val; s >> val; while( len != 0 ) { @ 1.1 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$ @