From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Mon, 26 Oct 2015 16:18:23 +0000 (+0000)
Subject: Make sure that raster buffer can hold enough data for all planes
X-Git-Tag: v2.2b1~168
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40150539e826b20dcf59bab7e7a330ba7f07d606;p=thirdparty%2Fcups.git

Make sure that raster buffer can hold enough data for all planes
(<rdar://problem/23133998>)


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12930 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES-2.1.txt b/CHANGES-2.1.txt
index 6c9863fd34..3ebbc6db15 100644
--- a/CHANGES-2.1.txt
+++ b/CHANGES-2.1.txt
@@ -7,7 +7,7 @@ CHANGES IN CUPS V2.1.1
 	  <rdar://problem/23132108>, <rdar://problem/23132353>,
 	  <rdar://problem/23132803>, <rdar://problem/23133230>,
 	  <rdar://problem/23133393>, <rdar://problem/23133466>,
-	  <rdar://problem/23133833>)
+	  <rdar://problem/23133833>, <rdar://problem/23133998>)
 	- The cupsGetPPD* functions did not work with IPP printers (STR #4725)
 	- Some older HP LaserJet printers need a delayed close when printing
 	  using the libusb-based USB backend (STR #4549)
diff --git a/filter/rastertoepson.c b/filter/rastertoepson.c
index b503795aef..38d6d5bfce 100644
--- a/filter/rastertoepson.c
+++ b/filter/rastertoepson.c
@@ -263,7 +263,7 @@ StartPage(
   * Allocate memory for a line/row of graphics...
   */
 
-  if ((Planes[0] = malloc(header->cupsBytesPerLine)) == NULL)
+  if ((Planes[0] = malloc(header->cupsBytesPerLine + NumPlanes)) == NULL)
   {
     fputs("ERROR: Unable to allocate memory\n", stderr);
     exit(1);