Skip to content

fix raster over-read on undersized media in ipptransform #191

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
tanjiroK-coder wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix raster over-read on undersized media in ipptransform #191

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: 20 additions & 9 deletions tools/ipptransform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2314,10 +2314,16 @@ pcl_start_page(xform_raster_t *ras, // I - Raster information
xform_write_cb_t cb, // I - Write callback
void *ctx) // I - Write context
{
unsigned hmargin = ras->header.HWResolution[0] / 4,
// Left/right margin
vmargin = ras->header.HWResolution[1] / 6;
// Top/bottom margin


// Setup margins to be 1/6" top and bottom and 1/4" or .135" on the
// left and right.
ras->top = ras->header.HWResolution[1] / 6;
ras->bottom = ras->header.cupsHeight - ras->header.HWResolution[1] / 6;
// left and right, dropping a margin when the page is too small for it...
ras->top = ras->header.cupsHeight > (2 * vmargin) ? vmargin : 0;
ras->bottom = ras->header.cupsHeight - ras->top;

if ((ras->header.PageSize[1] == 841 || ras->header.PageSize[1] == 842) && ras->header.cupsWidth >= (8 * ras->header.HWResolution[0]))
{
Expand All @@ -2328,8 +2334,8 @@ pcl_start_page(xform_raster_t *ras, // I - Raster information
else
{
// All other sizes get 1/4" margins
ras->left = ras->header.HWResolution[0] / 4;
ras->right = ras->header.cupsWidth - ras->header.HWResolution[0] / 4;
ras->left = ras->header.cupsWidth > (2 * hmargin) ? hmargin : 0;
ras->right = ras->header.cupsWidth - ras->left;
}

if (!ras->header.Duplex || (page & 1))
Expand Down Expand Up @@ -2983,14 +2989,19 @@ ps_start_page(xform_raster_t *ras, // I - Raster information
void *ctx) // I - Write context
{
const char *decode; // Image decoding values
unsigned hmargin = ras->header.HWResolution[0] / 6,
// Left/right margin
vmargin = ras->header.HWResolution[1] / 6;
// Top/bottom margin


fprintf(stderr, "DEBUG: Page %d: %ux%ux%u\n", page, ras->header.cupsWidth, ras->header.cupsHeight, ras->header.cupsBitsPerPixel);

ras->left = ras->header.HWResolution[0] / 6;
ras->right = ras->header.cupsWidth - ras->header.HWResolution[0] / 6;
ras->top = ras->header.HWResolution[1] / 6;
ras->bottom = ras->header.cupsHeight - ras->header.HWResolution[1] / 6;
// Setup 1/6" margins, dropping a margin when the page is too small for it...
ras->left = ras->header.cupsWidth > (2 * hmargin) ? hmargin : 0;
ras->right = ras->header.cupsWidth - ras->left;
ras->top = ras->header.cupsHeight > (2 * vmargin) ? vmargin : 0;
ras->bottom = ras->header.cupsHeight - ras->top;

if (ras->header.cupsColorSpace != CUPS_CSPACE_W && ras->header.cupsColorSpace != CUPS_CSPACE_SW && ras->header.cupsColorSpace != CUPS_CSPACE_K && ras->header.cupsColorSpace != CUPS_CSPACE_RGB && ras->header.cupsColorSpace != CUPS_CSPACE_SRGB)
{
Expand Down
Loading