From cc1e4dfb7e26ee9841af0a80f5aeb7f248fe8022 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Fri, 14 Jun 2024 14:02:27 -0400 Subject: [PATCH] Fix error handling when reading a bad 1setOf attribute. --- CHANGES.md | 6 ++++++ cups/ipp.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 4acbfd3901..5a32ec7076 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,12 @@ CHANGES - OpenPrinting CUPS 2.4.9 - (2024-06-11) ================================================ +Changes in CUPS v2.4.10 (TBD) +----------------------------- + +- Fixed error handling when reading a mixed `1setOf` attribute. + + Changes in CUPS v2.4.9 (2024-06-11) ----------------------------------- diff --git a/cups/ipp.c b/cups/ipp.c index f9037bc56a..bba888bead 100644 --- a/cups/ipp.c +++ b/cups/ipp.c @@ -3102,7 +3102,8 @@ ippReadIO(void *src, /* I - Data source */ { DEBUG_printf(("1ippReadIO: Converting %s attribute from %s to %s.", attr->name, ippTagString(value_tag), ippTagString(tag))); - ippSetValueTag(ipp, &attr, tag); + if (!ippSetValueTag(ipp, &attr, tag)) + goto rollback; } } else if (value_tag == IPP_TAG_INTEGER || -- 2.47.2