diff options
| author | markd <markd@pkgsrc.org> | 2010-09-15 19:47:33 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2010-09-15 19:47:33 +0000 |
| commit | 2db105c5645231a0c1a6357622038ba75257ef05 (patch) | |
| tree | aab23365a56ba2469f1fbdfd0f4207b4a0bfbe2d /graphics | |
| parent | e54a511d384d7ac9d1181b56eb5f67b46bb6f8b2 (diff) | |
| download | pkgsrc-2db105c5645231a0c1a6357622038ba75257ef05.tar.gz | |
patch for kde security advisory 20100825-1
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/kdegraphics4/Makefile | 4 | ||||
| -rw-r--r-- | graphics/kdegraphics4/distinfo | 3 | ||||
| -rw-r--r-- | graphics/kdegraphics4/patches/patch-aa | 34 |
3 files changed, 38 insertions, 3 deletions
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile index aa8b589ad1a..e7633d675ba 100644 --- a/graphics/kdegraphics4/Makefile +++ b/graphics/kdegraphics4/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.11 2010/09/14 11:01:17 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2010/09/15 19:47:33 markd Exp $ DISTNAME= kdegraphics-${_KDE_VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics COMMENT= Graphical tools for the KDE desktop diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo index 300de4d37bf..c525e5cbcd3 100644 --- a/graphics/kdegraphics4/distinfo +++ b/graphics/kdegraphics4/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.9 2010/07/04 11:02:32 markd Exp $ +$NetBSD: distinfo,v 1.10 2010/09/15 19:47:33 markd Exp $ SHA1 (kdegraphics-4.4.5.tar.bz2) = 9d878e917de53a0b70df7d1d9d9c57f771e4be72 RMD160 (kdegraphics-4.4.5.tar.bz2) = f574b9b5f89b868ccab250093ef75ab8db7d4833 Size (kdegraphics-4.4.5.tar.bz2) = 3822688 bytes +SHA1 (patch-aa) = 692a789e1652fb38d683cdb41a02769bb60139f7 diff --git a/graphics/kdegraphics4/patches/patch-aa b/graphics/kdegraphics4/patches/patch-aa new file mode 100644 index 00000000000..af55221b52b --- /dev/null +++ b/graphics/kdegraphics4/patches/patch-aa @@ -0,0 +1,34 @@ +$NetBSD: patch-aa,v 1.1 2010/09/15 19:47:33 markd Exp $ + +svn r1167826 for advisory 20100825-1 + +Index: okular/generators/plucker/unpluck/image.cpp +=================================================================== +--- okular/generators/plucker/unpluck/image.cpp (revision 1167825) ++++ okular/generators/plucker/unpluck/image.cpp (revision 1167826) +@@ -289,8 +289,23 @@ + for (j = 0; j < bytes_per_row;) { + incount = *palm_ptr++; + inval = *palm_ptr++; +- memset (rowbuf + j, inval, incount); +- j += incount; ++ if (incount + j <= bytes_per_row * width) ++ { ++ memset (rowbuf + j, inval, incount); ++ j += incount; ++ } ++ else ++ { ++ free (rowbuf); ++ free (lastrow); ++ free (jpeg_row); ++ ++ jpeg_destroy_compress (&cinfo); ++ ++ fclose( outfile ); ++ ++ return false; ++ } + } + } + else if ((flags & PALM_IS_COMPRESSED_FLAG) |