Skip to content

Commit 0ff8897

Browse files
committed
Expand allocation of options string.
1 parent 8d0f51c commit 0ff8897

2 files changed

Lines changed: 6 additions & 12 deletions

File tree

CHANGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Changes in CUPS v2.4.17 (YYYY-MM-DD)
1111
directory.
1212
- CVE-2026-NNNNN: The scheduler did not filter control characters from option
1313
values.
14+
- CVE-2026-NNNNN: The scheduler did not always allocate enough memory for a
15+
job's options string.
1416
- The scheduler followed symbolic links when cleaning out its temporary
1517
directory (Issue #1448)
1618
- Updated `cupsFileGetConf` and `cupsFilePutConf` to escape more characters.

scheduler/job.c

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4192,18 +4192,6 @@ ipp_length(ipp_t *ipp) /* I - IPP request */
41924192

41934193
for (attr = ipp->attrs; attr != NULL; attr = attr->next)
41944194
{
4195-
/*
4196-
* Skip attributes that won't be sent to filters...
4197-
*/
4198-
4199-
if (attr->value_tag == IPP_TAG_NOVALUE ||
4200-
attr->value_tag == IPP_TAG_MIMETYPE ||
4201-
attr->value_tag == IPP_TAG_NAMELANG ||
4202-
attr->value_tag == IPP_TAG_TEXTLANG ||
4203-
attr->value_tag == IPP_TAG_URI ||
4204-
attr->value_tag == IPP_TAG_URISCHEME)
4205-
continue;
4206-
42074195
/*
42084196
* Add space for a leading space and commas between each value.
42094197
* For the first attribute, the leading space isn't used, so the
@@ -4279,10 +4267,14 @@ ipp_length(ipp_t *ipp) /* I - IPP request */
42794267

42804268
case IPP_TAG_TEXT :
42814269
case IPP_TAG_NAME :
4270+
case IPP_TAG_TEXTLANG :
4271+
case IPP_TAG_NAMELANG :
4272+
case IPP_TAG_MIMETYPE :
42824273
case IPP_TAG_KEYWORD :
42834274
case IPP_TAG_CHARSET :
42844275
case IPP_TAG_LANGUAGE :
42854276
case IPP_TAG_URI :
4277+
case IPP_TAG_URISCHEME :
42864278
/*
42874279
* Strings can contain characters that need quoting. We need
42884280
* at least 2 * len + 2 characters to cover the quotes and

0 commit comments

Comments
 (0)