summaryrefslogtreecommitdiff
path: root/x11/kdelibs3/files/patch-post-3.4.0-kdelibs-kimgio
diff options
context:
space:
mode:
authorMichael Nottebrock <lofi@FreeBSD.org>2005-05-06 16:53:11 +0000
committerMichael Nottebrock <lofi@FreeBSD.org>2005-05-06 16:53:11 +0000
commit5564317dca8a9379e109d2db664ae3703c0e6532 (patch)
tree0db28a3cf2790524ae6392ed8baec0c7780fd14c /x11/kdelibs3/files/patch-post-3.4.0-kdelibs-kimgio
parent- Add MASTER_SITE_QMAIL (diff)
Fix regressions introduced in the previous KDE security updates:
The Kimgio patch broke reading of .rgb images in most cases due to a fence-post error. The Kommander patch was incorrect and still allowed execution of files served from /tmp. Security: References: http://www.kde.org/info/security/advisory-20050421-1.txt http://www.kde.org/info/security/advisory-20050420-1.txt
Diffstat (limited to '')
-rw-r--r--x11/kdelibs3/files/patch-post-3.4.0-kdelibs-kimgio9
1 files changed, 0 insertions, 9 deletions
diff --git a/x11/kdelibs3/files/patch-post-3.4.0-kdelibs-kimgio b/x11/kdelibs3/files/patch-post-3.4.0-kdelibs-kimgio
index f7990101ae3f..c1ede2bf9945 100644
--- a/x11/kdelibs3/files/patch-post-3.4.0-kdelibs-kimgio
+++ b/x11/kdelibs3/files/patch-post-3.4.0-kdelibs-kimgio
@@ -620,15 +620,6 @@ diff -u -3 -d -p -r1.31 -r1.31.2.1
for (x = 0; x < m_xsize; x++, c++)
*c = qRgba(qRed(*c), qGreen(*c), qBlue(*c), line[x]);
}
-@@ -270,7 +272,7 @@ bool SGIImage::readImage(QImage& img)
- // sanity ckeck
- if (m_rle)
- for (uint o = 0; o < m_numrows; o++)
-- if (m_starttab[o] + m_lengthtab[o] > m_data.size()) {
-+ if (m_starttab[o] + m_lengthtab[o] >= m_data.size()) {
- kdDebug(399) << "image corrupt (sanity check failed)" << endl;
- return false;
- }
diff -u -3 -d -p -r1.14 -r1.14.2.1
--- kimgio/tiffr.cpp 22 Nov 2004 03:52:18 -0000 1.14
+++ kimgio/tiffr.cpp 19 Apr 2005 10:48:00 -0000 1.14.2.1