diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-10-23 20:30:33 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-10-23 20:30:33 +0000 |
| commit | 3a555a4f30becb8db6651e6958ceb289f0611f79 (patch) | |
| tree | c35ffa380f61992487cc82ba3ebf0a66cbcff10a /filter | |
| parent | fd5ce3a47b8ffb290d59e6727ecfa445455535d1 (diff) | |
Ensure that cupsBytesPerLine < 2^31 for 32-bit only platforms
(<rdar://problem/23133393>)
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12923 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/raster.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |