Fix error handling when reading a bad 1setOf attribute.

michaelrsweet · michaelrsweet · commit cc1e4dfb7e26 · 2024-06-14T14:02:27.000-04:00
diff --git 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
@@ -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 ||

Original file line number	Diff line number	Diff line change
`@@ -3102,7 +3102,8 @@ ippReadIO(void src, / I - Data source */`
`3102`	`3102`	`{`
`3103`	`3103`	`DEBUG_printf(("1ippReadIO: Converting %s attribute from %s to %s.",`
`3104`	`3104`	`attr->name, ippTagString(value_tag), ippTagString(tag)));`
`3105`		`- ippSetValueTag(ipp, &attr, tag);`
	`3105`	`+ if (!ippSetValueTag(ipp, &attr, tag))`
	`3106`	`+ goto rollback;`
`3106`	`3107`	`}`
`3107`	`3108`	`}`
`3108`	`3109`	`else if (value_tag == IPP_TAG_INTEGER \|\|`