diff options
| -rw-r--r-- | CHANGES-2.1.txt | 3 | ||||
| -rw-r--r-- | filter/raster.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGES-2.1.txt b/CHANGES-2.1.txt index dd85cf55b..41de655a4 100644 --- a/CHANGES-2.1.txt +++ b/CHANGES-2.1.txt @@ -5,7 +5,8 @@ CHANGES IN CUPS V2.1.1 - Security hardening fixes (<rdar://problem/23131948>, <rdar://problem/23132108>, <rdar://problem/23132353>, - <rdar://problem/23132803>, <rdar://problem/23133230>) + <rdar://problem/23132803>, <rdar://problem/23133230>, + <rdar://problem/23133393>) - 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/raster.c b/filter/raster.c index 879012fd4..eff266e9b 100644 --- a/filter/raster.c +++ b/filter/raster.c @@ -1022,7 +1022,7 @@ cups_raster_read_header( DEBUG_printf(("4cups_raster_read_header: cupsBitsPerPixel=%u, cupsBitsPerColor=%u, cupsBytesPerLine=%u, cupsWidth=%u, cupsHeight=%u, r->bpp=%d", r->header.cupsBitsPerPixel, r->header.cupsBitsPerColor, r->header.cupsBytesPerLine, r->header.cupsWidth, r->header.cupsHeight, r->bpp)); - return (r->header.cupsBitsPerPixel > 0 && r->header.cupsBitsPerPixel <= 240 && r->header.cupsBitsPerColor > 0 && r->header.cupsBitsPerColor <= 16 && r->header.cupsBytesPerLine != 0 && r->header.cupsHeight != 0 && (r->header.cupsBytesPerLine % r->bpp) == 0); + return (r->header.cupsBitsPerPixel > 0 && r->header.cupsBitsPerPixel <= 240 && r->header.cupsBitsPerColor > 0 && r->header.cupsBitsPerColor <= 16 && r->header.cupsBytesPerLine > 0 && r->header.cupsBytesPerLine <= 0x7fffffff && r->header.cupsHeight != 0 && (r->header.cupsBytesPerLine % r->bpp) == 0); } |