Skip to content

imagetoraster: reject output dimensions that overflow cupsBytesPerLine #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ManasBagul23 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

imagetoraster: reject output dimensions that overflow cupsBytesPerLine #264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions cupsfilters/imagetoraster.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include <math.h>
#include <signal.h>
#include <string.h>
#include <limits.h>


//
Expand Down Expand Up @@ -1351,11 +1352,31 @@ cfFilterImageToRaster(int inputfd, // I - File descriptor input stream
header.cupsHeight = (doc.Orientation & 1 ? xprint : yprint) *
header.HWResolution[1];
}
header.cupsBytesPerLine = (header.cupsBitsPerPixel *
header.cupsWidth + 7) / 8;
{
// header.cupsBitsPerPixel and header.cupsWidth are both unsigned (32-bit);
// an extreme HWResolution/page-size combination from the PPD can make
// their product wrap before the +7/8 rounds it down to bytes, handing
// the formatter a cupsBytesPerLine far smaller than the row it actually
// writes. Compute in a wider type and reject the page instead of
// silently wrapping.
size_t bytes_per_line = ((size_t)header.cupsBitsPerPixel *
(size_t)header.cupsWidth + 7) / 8;

if (header.cupsColorOrder == CUPS_ORDER_BANDED)
bytes_per_line *= header.cupsNumColors;

if (bytes_per_line > UINT_MAX)
{
if (log)
log(ld, CF_LOGLEVEL_ERROR,
"cfFilterImageToRaster: Unsupported output dimensions (row would "
"need %zu bytes).", bytes_per_line);
cfImageClose(img);
return (1);
}

if (header.cupsColorOrder == CUPS_ORDER_BANDED)
header.cupsBytesPerLine *= header.cupsNumColors;
header.cupsBytesPerLine = (unsigned)bytes_per_line;
}

header.Margins[0] = doc.PageLeft;
header.Margins[1] = doc.PageBottom;
Expand Down