summaryrefslogtreecommitdiff
path: root/filter/rastertopwg.c
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2015-05-06 12:24:47 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2015-05-06 12:24:47 +0000
commitc130ea1d8163c1ef7f4585acf6c91ca14b7cd303 (patch)
tree4e2626a1af5a5ac5c79acf476db976651ba8bede /filter/rastertopwg.c
parent33076d249bcac412a87c23e2b4df5e234a217fd9 (diff)
downloadcups-c130ea1d8163c1ef7f4585acf6c91ca14b7cd303.tar.gz
The rastertopwg filter did not check for truncated input (STR #4597)
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12609 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'filter/rastertopwg.c')
-rw-r--r--filter/rastertopwg.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/filter/rastertopwg.c b/filter/rastertopwg.c
index 12f77d66f..569460bc0 100644
--- a/filter/rastertopwg.c
+++ b/filter/rastertopwg.c
@@ -418,7 +418,14 @@ main(int argc, /* I - Number of command-line args */
for (y = inheader.cupsHeight; y > 0; y --)
{
- cupsRasterReadPixels(inras, line + lineoffset, inheader.cupsBytesPerLine);
+ if (cupsRasterReadPixels(inras, line + lineoffset, inheader.cupsBytesPerLine) != inheader.cupsBytesPerLine)
+ {
+ _cupsLangPrintFilter(stderr, "ERROR", _("Error reading raster data."));
+ fprintf(stderr, "DEBUG: Unable to read line %d for page %d.\n",
+ inheader.cupsHeight - y + page_top + 1, page);
+ return (1);
+ }
+
if (!cupsRasterWritePixels(outras, line, outheader.cupsBytesPerLine))
{
_cupsLangPrintFilter(stderr, "ERROR", _("Error sending raster data."));