components/desktop/libpng/patches/libpng10-libpng12-CVE-2014-9495-CVE-2015-0973.patch_2
author Niveditha Rau <Niveditha.Rau@Oracle.COM>
Thu, 17 Mar 2016 08:44:16 -0700
changeset 5622 b0275c75884a
permissions -rw-r--r--
22916341 move libjpeg from desktop to userland 22916316 move libtiff from desktop to userland 22916330 move libpng from desktop to userland 22890827 Tiff man pages are incorrectly installed under /usr/share/man/man3 directory. 15600516 libjpeg manpage should not provide pointers to documents that don't exist 15545272 man pages errors (libpng and libjpeg)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5622
b0275c75884a 22916341 move libjpeg from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     1
This patch will be removed when we EOL the two older versions of libpng
b0275c75884a 22916341 move libjpeg from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     2
b0275c75884a 22916341 move libjpeg from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     3
--- libpng-1.0.59/pngset.c.orig	2015-05-21 19:18:14.033684319 +0530
b0275c75884a 22916341 move libjpeg from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     4
+++ libpng-1.0.59/pngset.c	2015-05-21 19:20:23.208626616 +0530
b0275c75884a 22916341 move libjpeg from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     5
@@ -263,7 +263,10 @@ png_set_IHDR(png_structp png_ptr, png_in
b0275c75884a 22916341 move libjpeg from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     6
                  - 1        /* filter byte */
b0275c75884a 22916341 move libjpeg from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     7
                  - 7*8      /* rounding of width to multiple of 8 pixels */
b0275c75884a 22916341 move libjpeg from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     8
                  - 8)       /* extra max_pixel_depth pad */
b0275c75884a 22916341 move libjpeg from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
     9
+   {
b0275c75884a 22916341 move libjpeg from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    10
       info_ptr->rowbytes = (png_size_t)0;
b0275c75884a 22916341 move libjpeg from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    11
+      png_error(png_ptr, "Image width is too large for this architecture");
b0275c75884a 22916341 move libjpeg from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    12
+   }
b0275c75884a 22916341 move libjpeg from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    13
    else
b0275c75884a 22916341 move libjpeg from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    14
       info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
b0275c75884a 22916341 move libjpeg from desktop to userland
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset
    15
 }