summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2005-04-18 16:54:00 +0000
committerdrochner <drochner@pkgsrc.org>2005-04-18 16:54:00 +0000
commit19c00732d1fe072b4a0bf6e27ddb6bc7bf864325 (patch)
treed4d4c852870411ccfdbf4412f0b1fe33b7837998 /x11
parenta40d5a8502d598b9f5aec426ef2cca21986c8004 (diff)
downloadpkgsrc-19c00732d1fe072b4a0bf6e27ddb6bc7bf864325.tar.gz
Add an explicite check to a QImage construction. There is an inplicite
check, but it is not obvious whether it will catch all cases, in particular with corrupted TIFF files. Was the last occurence of an not-explicitely-checked QImage construction, so things are consistent now.
Diffstat (limited to 'x11')
-rw-r--r--x11/kdelibs3/distinfo3
-rw-r--r--x11/kdelibs3/patches/patch-dh13
2 files changed, 15 insertions, 1 deletions
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 93a70dc1d49..faa131c0013 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.53 2005/04/12 11:00:03 drochner Exp $
+$NetBSD: distinfo,v 1.54 2005/04/18 16:54:00 drochner Exp $
SHA1 (kdelibs-3.4.0.tar.bz2) = ca3ded4105a500dae5170ccf85cd62af98b33961
RMD160 (kdelibs-3.4.0.tar.bz2) = 75917f60d115d770b5a8aa3922591e118c6bfdf0
@@ -25,3 +25,4 @@ SHA1 (patch-dd) = 161bf22a8e4178fd01e08f98be3a6534a6c74895
SHA1 (patch-de) = 6765fbda3d248e164d5694fe54fb85c7a28d6a34
SHA1 (patch-df) = 4c7c73e8942e6842f58420bbe5b9491e7116002d
SHA1 (patch-dg) = de05b75ab2f7d41fb0feaccd74cb460ef8a3412c
+SHA1 (patch-dh) = 9981f590f83e4543e2e3478b607aed36afe373c5
diff --git a/x11/kdelibs3/patches/patch-dh b/x11/kdelibs3/patches/patch-dh
new file mode 100644
index 00000000000..60031b2b2de
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-dh
@@ -0,0 +1,13 @@
+$NetBSD: patch-dh,v 1.1 2005/04/18 16:54:00 drochner Exp $
+
+--- kimgio/g3r.cpp.orig 2005-04-16 23:06:10.000000000 +0200
++++ kimgio/g3r.cpp
+@@ -28,7 +28,7 @@ KDE_EXPORT void kimgio_g3_read( QImageIO
+
+ QImage image(width, height, 1, 0, QImage::BigEndian);
+
+- if (scanlength != image.bytesPerLine())
++ if (image.isNull() || scanlength != image.bytesPerLine())
+ {
+ TIFFClose(tiff);
+ return;