[pkgsrc/trunk]: pkgsrc/x11/kdelibs3 Add an explicite check to a QImage constr...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c82d3b71c054
branches:  trunk
changeset: 492719:c82d3b71c054
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Mon Apr 18 16:54:00 2005 +0000

description:
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:

 x11/kdelibs3/distinfo         |   3 ++-
 x11/kdelibs3/patches/patch-dh |  13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r 6a500388d9c8 -r c82d3b71c054 x11/kdelibs3/distinfo
--- a/x11/kdelibs3/distinfo     Mon Apr 18 16:47:21 2005 +0000
+++ b/x11/kdelibs3/distinfo     Mon Apr 18 16:54:00 2005 +0000
@@ -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-de) = 6765fbda3d248e164d5694fe54fb85c7a28d6a34
 SHA1 (patch-df) = 4c7c73e8942e6842f58420bbe5b9491e7116002d
 SHA1 (patch-dg) = de05b75ab2f7d41fb0feaccd74cb460ef8a3412c
+SHA1 (patch-dh) = 9981f590f83e4543e2e3478b607aed36afe373c5
diff -r 6a500388d9c8 -r c82d3b71c054 x11/kdelibs3/patches/patch-dh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdelibs3/patches/patch-dh     Mon Apr 18 16:54:00 2005 +0000
@@ -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;