From f8e5a7b4988a506d284a2a286167fd5d76764d8a Mon Sep 17 00:00:00 2001
From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Wed, 25 Mar 2015 18:44:16 +0000
Subject: [PATCH] Fix another potential buffer overflow (STR #4599)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12570 a1ca3aef-8c08-0410-bb20-df032aa958be
---
 CHANGES-2.0.txt | 3 ++-
 filter/raster.c | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES-2.0.txt b/CHANGES-2.0.txt
index de1a5a7e4..73a7b9406 100644
--- a/CHANGES-2.0.txt
+++ b/CHANGES-2.0.txt
@@ -5,7 +5,8 @@ CHANGES IN CUPS V2.0.3
 
 	- Restored missing generic printer icon file (STR #4587)
 	- Fixed logging of configuration errors to show up as errors (STR #4582)
-	- Fixed buffer overflow in rastertopwg (STR #4598)
+	- Fixed potential buffer overflows in raster code and filters
+	  (STR #4598, STR #4599)
 	- Added Russian translation (STR #4577)
 
 
diff --git a/filter/raster.c b/filter/raster.c
index c3247da81..f455f4757 100644
--- a/filter/raster.c
+++ b/filter/raster.c
@@ -1291,6 +1291,9 @@ cups_raster_write(
   */
 
   count = r->header.cupsBytesPerLine * 2;
+  if (count < 3)
+    count = 3;
+
   if ((size_t)count > r->bufsize)
   {
     if (r->buffer)
-- 
2.39.2