64 lines
2.3 KiB
Diff
64 lines
2.3 KiB
Diff
|
diff --git a/cups/ipp.c b/cups/ipp.c
|
||
|
|
index 95d53cc44..325de02b9 100644
|
||
|
|
--- a/cups/ipp.c
|
||
|
|
+++ b/cups/ipp.c
|
||
|
|
@@ -5033,16 +5033,19 @@ ippValidateAttribute(
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (*ptr < ' ' || *ptr == 0x7f)
|
||
|
|
- {
|
||
|
|
- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad control character (PWG 5100.14 section 8.3)."), attr->name, attr->values[i].string.text);
|
||
|
|
- return (0);
|
||
|
|
- }
|
||
|
|
- else if (*ptr)
|
||
|
|
- {
|
||
|
|
- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."), attr->name, attr->values[i].string.text);
|
||
|
|
- return (0);
|
||
|
|
- }
|
||
|
|
+ if (*ptr)
|
||
|
|
+ {
|
||
|
|
+ if (*ptr < ' ' || *ptr == 0x7f)
|
||
|
|
+ {
|
||
|
|
+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad control character (PWG 5100.14 section 8.3)."), attr->name, attr->values[i].string.text);
|
||
|
|
+ return (0);
|
||
|
|
+ }
|
||
|
|
+ else
|
||
|
|
+ {
|
||
|
|
+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad text value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.2)."), attr->name, attr->values[i].string.text);
|
||
|
|
+ return (0);
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
|
||
|
|
if ((ptr - attr->values[i].string.text) > (IPP_MAX_TEXT - 1))
|
||
|
|
{
|
||
|
|
@@ -5091,16 +5094,19 @@ ippValidateAttribute(
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (*ptr < ' ' || *ptr == 0x7f)
|
||
|
|
- {
|
||
|
|
- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad control character (PWG 5100.14 section 8.1)."), attr->name, attr->values[i].string.text);
|
||
|
|
- return (0);
|
||
|
|
- }
|
||
|
|
- else if (*ptr)
|
||
|
|
+ if (*ptr)
|
||
|
|
{
|
||
|
|
- ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."), attr->name, attr->values[i].string.text);
|
||
|
|
- return (0);
|
||
|
|
- }
|
||
|
|
+ if (*ptr < ' ' || *ptr == 0x7f)
|
||
|
|
+ {
|
||
|
|
+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad control character (PWG 5100.14 section 8.1)."), attr->name, attr->values[i].string.text);
|
||
|
|
+ return (0);
|
||
|
|
+ }
|
||
|
|
+ else
|
||
|
|
+ {
|
||
|
|
+ ipp_set_error(IPP_STATUS_ERROR_BAD_REQUEST, _("\"%s\": Bad name value \"%s\" - bad UTF-8 sequence (RFC 8011 section 5.1.3)."), attr->name, attr->values[i].string.text);
|
||
|
|
+ return (0);
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
|
||
|
|
if ((ptr - attr->values[i].string.text) > (IPP_MAX_NAME - 1))
|
||
|
|
{
|