Skip to content

fix ippGetLength overcount for value tags 0x7f-0xff #205

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

Closed
tanjiroK-coder wants to merge 1 commit into from
Closed

fix ippGetLength overcount for value tags 0x7f-0xff #205

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion cups/ipp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5150,7 +5150,7 @@ ipp_length(ipp_t *ipp, // I - IPP message or collection

DEBUG_printf("5ipp_length: attr->name=\"%s\", attr->num_values=%u, bytes=" CUPS_LLFMT, attr->name, (unsigned)attr->num_values, CUPS_LLCAST bytes);

if ((attr->value_tag & ~IPP_TAG_CUPS_CONST) < IPP_TAG_EXTENSION)
if ((attr->value_tag & ~IPP_TAG_CUPS_CONST) <= 0xff)
bytes += (size_t)attr->num_values;// Value tag for each value
else
bytes += (size_t)(5 * attr->num_values);
Expand Down
54 changes: 54 additions & 0 deletions cups/testipp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,25 @@ static ipp_uchar_t mixed[] = // Mixed value buffer
IPP_TAG_END // end tag
};

static ipp_uchar_t extension[] = // Extension value buffer
{
0x02, 0x00, // IPP version
0x00, 0x0b, // Get-Printer-Attributes operation
0x00, 0x00, 0x00, 0x01,
// Request ID

IPP_TAG_OPERATION,

IPP_TAG_EXTENSION, // extension tag
0x00, 0x05, // Name length + name
'x', '-', 'e', 'x', 't',
0x00, 0x06, // Value length + value
0x40, 0x00, 0x00, 0x01,
'h', 'i',

IPP_TAG_END // end tag
};


//
// Local functions...
Expand Down Expand Up @@ -640,6 +659,41 @@ main(int argc, // I - Number of command-line arguments
else
testEnd(true);

// Read the extension data and confirm ippGetLength() matches...
testBegin("Read Extension Value from Memory");

request = ippNew();
data.rpos = 0;
data.wused = sizeof(extension);
data.wsize = sizeof(extension);
data.wbuffer = extension;

while ((state = ippReadIO(&data, (ipp_io_cb_t)read_cb, 1, NULL, request)) != IPP_STATE_DATA)
{
if (state == IPP_STATE_ERROR)
break;
}

length = ippGetLength(request);

if (state != IPP_STATE_DATA)
{
testEndMessage(false, "%d bytes read", (int)data.rpos);
status = 1;
}
else if (length != sizeof(extension))
{
testEndMessage(false, "wrong ippGetLength(), %d instead of %d bytes", (int)length, (int)sizeof(extension));
print_attributes(request, 8);
status = 1;
}
else
{
testEnd(true);
}

ippDelete(request);

// Read the mixed data and confirm we converted everything to rangeOfInteger
// values...
testBegin("Read Mixed integer/rangeOfInteger from Memory");
Expand Down
Loading