Skip to content

ppd-ipp.c: Enhance integer conversion in ppdLoadAttributes() #38

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

Merged
tillkamppeter merged 1 commit into from
Mar 8, 2024
Merged

ppd-ipp.c: Enhance integer conversion in ppdLoadAttributes() #38

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
14 changes: 9 additions & 5 deletions ppd/ppd-ipp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ ppdLoadAttributes(
int def_found,
order,
face_up,
num,
have_custom_size = 0;
cups_page_header_t header;
static const char * const pdls[][2] =
Expand Down Expand Up @@ -657,13 +658,16 @@ ppdLoadAttributes(
yres = res_y[0];
}
}
else if (strlen(items[0]) > 0 &&
((int)(strtol(items[0], &p, 10) * 0) ||
(errno == 0 && *p == '\0')))
else if (items[0][0] && ((num = strtol(items[0], &p, 10)) | 1) && errno == 0 && *p == '\0')
{
// bitwise OR is used in case the read string is "0".
// we had to use strtol() in case there are keyword values starting with a number...
int_item[0] = num;

// Integer number(s)
for (j = 0; j < num_items; j ++)
int_item[j] = (int)strtol(items[j], NULL, 10);
for (j = 1; j < num_items; j ++)
int_item[j] = (int)strtol(items[j], &p, 10);

ippAddIntegers(attrs, IPP_TAG_PRINTER, IPP_TAG_INTEGER, item_buf,
num_items, int_item);
}
Expand Down