Skip to content

strip control characters from printer keywords in ipp backend #1632

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

strip control characters from printer keywords in ipp backend #1632

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
13 changes: 12 additions & 1 deletion backend/ipp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3233,6 +3233,10 @@ report_printer_state(ipp_t *ipp) /* I - IPP response */
cupsCopyString(value, ippGetString(pmja, i, NULL), sizeof(value));
}

for (valptr = value; *valptr; valptr ++)
if ((*valptr & 255) < ' ' || *valptr == 0x7f)
*valptr = ' ';

if (strcmp(value, mandatory_attrs))
{
cupsCopyString(mandatory_attrs, value, sizeof(mandatory_attrs));
Expand Down Expand Up @@ -3578,7 +3582,8 @@ update_reasons(ipp_attribute_t *attr, /* I - printer-state-reasons or NULL */

if (attr)
{
int i; /* Looping var */
int i; /* Looping var */
const char *rp; /* Pointer into reason keyword */

new_reasons = cupsArrayNew((cups_array_func_t)_cupsArrayStrcmp, NULL);
op = '\0';
Expand All @@ -3587,6 +3592,12 @@ update_reasons(ipp_attribute_t *attr, /* I - printer-state-reasons or NULL */
{
reason = attr->values[i].string.text;

for (rp = reason; *rp; rp ++)
if ((*rp & 255) < ' ' || *rp == 0x7f)
break;
if (*rp)
continue; /* Skip keyword with control chars */

if (strcmp(reason, "none") &&
strcmp(reason, "none-report") &&
strcmp(reason, "paused") &&
Expand Down
Loading