Fix error handling when reading a bad 1setOf attribute.

diff --git a/CHANGES.md b/CHANGES.md
index 4acbfd39016491cfe53106100184f34e211a4a8f..5a32ec70761ef3ca4da5b48a99773818c3ed0dd5 100644 (file)
--- 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 f9037bc56a2ce07a4c0dae147cc8f0b78e40d540..bba888beadbb02d9262b36a9c33e8843746be6e4 100644 (file)
--- 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 ||