cups_raster_read_header might divide by zero

[michaelrsweet]

Version: 2.0-current
CUPS.org User: pdewacht

As noted in STR #4551, cups_raster_read_header will divide by zero if cupsBitsPerColor or cupsBitPerPixel is zero. Instead it should report failure without crashing the program.

[michaelrsweet]

CUPS.org User: mike

Fixed in Subversion repository.

[michaelrsweet]

"str4596.patch":

Index: filter/raster.c

--- filter/raster.c (revision 12597)
+++ filter/raster.c (working copy)
@@ -970,7 +970,7 @@

cups_raster_update(r);

• return (r->header.cupsBytesPerLine != 0 && r->header.cupsHeight != 0 && (r->header.cupsBytesPerLine % r->bpp) == 0);
• return (r->header.cupsBitsPerPixel != 0 && r->header.cupsBitsPerColor != 0 && r->header.cupsBytesPerLine != 0 && r->header.cupsHeight != 0 && (r->header.cupsBytesPerLine % r->bpp) == 0);
  }

@@ -1240,6 +1240,9 @@
else
r->bpp = (r->header.cupsBitsPerColor + 7) / 8;

• if (r->bpp == 0)
• r->bpp = 1;

/*

• Set the number of remaining rows...
  */