Fix non-quick copies of collection values.

OpenPrinting · May 3, 2024 · aba9170 · aba9170
1 parent ce40a05
commit aba9170
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 7 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -92,6 +92,7 @@ Changes in CUPS v2.5b1 (TBA)
 - Fixed CGI program initialization and validation of form checkbox and text
   fields.
 - Fixed finishing support in ippeveps.
+- Fixed non-quick copy of collection values.
 - Removed hash support for SHA2-512-224 and SHA2-512-256.
 - Removed `mantohtml` script for generating html pages (use
   `https://www.msweet.org/mantohtml/`)

diff --git a/cups/ipp.c b/cups/ipp.c
@@ -1434,15 +1434,37 @@ ippCopyAttribute(
         break;
 
     case IPP_TAG_BEGIN_COLLECTION :
-        for (i = srcattr->num_values, srcval = srcattr->values, dstattr = NULL; i > 0; i --, srcval ++)
+        if (quickcopy)
+        {
+	  for (i = srcattr->num_values, srcval = srcattr->values, dstattr = NULL; i > 0; i --, srcval ++)
+	  {
+	    if (srcval->collection)
+	    {
+	      if (dstattr)
+		ippSetCollection(dst, &dstattr, ippGetCount(dstattr), srcval->collection);
+	      else
+		dstattr = ippAddCollection(dst, srcattr->group_tag, srcattr->name, srcval->collection);
+	    }
+	  }
+	}
+	else
 	{
-	  if (srcval->collection)
+	  for (i = srcattr->num_values, srcval = srcattr->values, dstattr = NULL; i > 0; i --, srcval ++)
 	  {
-	    if (dstattr)
-	      ippSetCollection(dst, &dstattr, ippGetCount(dstattr), srcval->collection);
-	    else
-              dstattr = ippAddCollection(dst, srcattr->group_tag, srcattr->name, srcval->collection);
-          }
+	    if (srcval->collection)
+	    {
+	      ipp_t *col = ippNew();	// Copy of collection
+
+	      ippCopyAttributes(col, srcval->collection, false, /*cb*/NULL, /*cb_data*/NULL);
+
+	      if (dstattr)
+		ippSetCollection(dst, &dstattr, ippGetCount(dstattr), col);
+	      else
+		dstattr = ippAddCollection(dst, srcattr->group_tag, srcattr->name, col);
+
+              col->use --;
+	    }
+	  }
 	}
         break;