diff options
author | Timo Gurr <tgurr@gentoo.org> | 2008-10-11 15:57:03 +0000 |
---|---|---|
committer | Timo Gurr <tgurr@gentoo.org> | 2008-10-11 15:57:03 +0000 |
commit | f7882c7a4f8583567efc502b26564524c839f0e9 (patch) | |
tree | 1f44c7b412f2323943c37c99b01198bb2115cb17 /net-print/cups/files | |
parent | Stable for HPPA (bug #241168). (diff) | |
download | gentoo-2-f7882c7a4f8583567efc502b26564524c839f0e9.tar.gz gentoo-2-f7882c7a4f8583567efc502b26564524c839f0e9.tar.bz2 gentoo-2-f7882c7a4f8583567efc502b26564524c839f0e9.zip |
Fix broken Manifest, bug #241216. Remove leftover patch from filesdir.
(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 x86_64)
Diffstat (limited to 'net-print/cups/files')
-rw-r--r-- | net-print/cups/files/cups-1.3.7-CVE-2008-1722.patch | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/net-print/cups/files/cups-1.3.7-CVE-2008-1722.patch b/net-print/cups/files/cups-1.3.7-CVE-2008-1722.patch deleted file mode 100644 index 908134c47ee4..000000000000 --- a/net-print/cups/files/cups-1.3.7-CVE-2008-1722.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -Naur cups-1.3.7/filter/image-png.c cups-1.3.7.new/filter/image-png.c ---- cups-1.3.7/filter/image-png.c 2007-07-11 23:46:42.000000000 +0200 -+++ cups-1.3.7.new/filter/image-png.c 2008-04-14 15:48:56.641188980 +0200 -@@ -3,7 +3,7 @@ - * - * PNG image routines for the Common UNIX Printing System (CUPS). - * -- * Copyright 2007 by Apple Inc. -+ * Copyright 2007-2008 by Apple Inc. - * Copyright 1993-2007 by Easy Software Products. - * - * These coded instructions, statements, and computer programs are the -@@ -170,16 +170,56 @@ - * Interlaced images must be loaded all at once... - */ - -+ size_t bufsize; /* Size of buffer */ -+ -+ - if (color_type == PNG_COLOR_TYPE_GRAY || - color_type == PNG_COLOR_TYPE_GRAY_ALPHA) -- in = malloc(img->xsize * img->ysize); -+ { -+ bufsize = img->xsize * img->ysize; -+ -+ if ((bufsize / img->ysize) != img->xsize) -+ { -+ fprintf(stderr, "DEBUG: PNG image dimensions (%ux%u) too large!\n", -+ (unsigned)width, (unsigned)height); -+ fclose(fp); -+ return (1); -+ } -+ } - else -- in = malloc(img->xsize * img->ysize * 3); -+ { -+ bufsize = img->xsize * img->ysize * 3; -+ -+ if ((bufsize / (img->ysize * 3)) != img->xsize) -+ { -+ fprintf(stderr, "DEBUG: PNG image dimensions (%ux%u) too large!\n", -+ (unsigned)width, (unsigned)height); -+ fclose(fp); -+ return (1); -+ } -+ } -+ -+ in = malloc(bufsize); - } - - bpp = cupsImageGetDepth(img); - out = malloc(img->xsize * bpp); - -+ if (!in || !out) -+ { -+ fputs("DEBUG: Unable to allocate memory for PNG image!\n", stderr); -+ -+ if (in) -+ free(in); -+ -+ if (out) -+ free(out); -+ -+ fclose(fp); -+ -+ return (1); -+ } -+ - /* - * Read the image, interlacing as needed... - */ |