Blame SOURCES/cups-str4551.patch
|
 |
dc9527 |
diff -up cups-1.6.3/filter/raster.c.str4551 cups-1.6.3/filter/raster.c
|
|
|
dc9527 |
--- cups-1.6.3/filter/raster.c.str4551 2013-06-07 03:12:52.000000000 +0200
|
|
|
dc9527 |
+++ cups-1.6.3/filter/raster.c 2015-06-10 11:58:55.393299339 +0200
|
|
|
dc9527 |
@@ -281,7 +281,10 @@ cupsRasterReadHeader(
|
|
|
dc9527 |
*/
|
|
|
dc9527 |
|
|
|
dc9527 |
if (!cups_raster_read_header(r))
|
|
|
dc9527 |
+ {
|
|
|
dc9527 |
+ memset(h, 0, sizeof(cups_page_header_t));
|
|
|
dc9527 |
return (0);
|
|
|
dc9527 |
+ }
|
|
|
dc9527 |
|
|
|
dc9527 |
/*
|
|
|
dc9527 |
* Copy the header to the user-supplied buffer...
|
|
|
dc9527 |
@@ -310,7 +313,10 @@ cupsRasterReadHeader2(
|
|
|
dc9527 |
*/
|
|
|
dc9527 |
|
|
|
dc9527 |
if (!cups_raster_read_header(r))
|
|
|
dc9527 |
+ {
|
|
|
dc9527 |
+ memset(h, 0, sizeof(cups_page_header2_t));
|
|
|
dc9527 |
return (0);
|
|
|
dc9527 |
+ }
|
|
|
dc9527 |
|
|
|
dc9527 |
/*
|
|
|
dc9527 |
* Copy the header to the user-supplied buffer...
|
|
|
dc9527 |
@@ -988,7 +994,7 @@ cups_raster_read_header(
|
|
|
dc9527 |
|
|
|
dc9527 |
cups_raster_update(r);
|
|
|
dc9527 |
|
|
|
dc9527 |
- return (r->header.cupsBytesPerLine != 0 && r->header.cupsHeight != 0);
|
|
|
dc9527 |
+ return (r->header.cupsBytesPerLine != 0 && r->header.cupsHeight != 0 && (r->header.cupsBytesPerLine % r->bpp) == 0);
|
|
|
dc9527 |
}
|
|
|
dc9527 |
|
|
|
dc9527 |
|