From: Michael Sweet <michael.r.sweet@gmail.com>
Date: Wed, 2 Aug 2017 23:53:50 +0000 (-0400)
Subject: The `ippCopyAttribute` function did not copy out-of-band values correctly
X-Git-Tag: v2.2.5~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10f9350b7e80c69c4c7cb49166b807ef28a637a6;p=thirdparty%2Fcups.git

The `ippCopyAttribute` function did not copy out-of-band values correctly
(rdar://33688003)
---

diff --git a/CHANGES.md b/CHANGES.md
index be246c483..ad406c9c0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -36,6 +36,8 @@ CHANGES IN CUPS V2.2.5
   printers (rdar://33250434)
 - Fixed the `cups.strings` file that is used on macOS (rdar://33287650)
 - CUPS now sends the `Date` HTTP header in IPP requests (rdar://33302034)
+- The `ippCopyAttribute` function did not copy out-of-band values correctly
+  (rdar://33688003)
 
 
 CHANGES IN CUPS V2.2.4
diff --git a/cups/ipp.c b/cups/ipp.c
index 429a05eaf..5fd587040 100644
--- a/cups/ipp.c
+++ b/cups/ipp.c
@@ -1509,6 +1509,16 @@ ippCopyAttribute(
         dstattr = ippAddSeparator(dst);
 	break;
 
+    case IPP_TAG_UNSUPPORTED_VALUE :
+    case IPP_TAG_DEFAULT :
+    case IPP_TAG_UNKNOWN :
+    case IPP_TAG_NOVALUE :
+    case IPP_TAG_NOTSETTABLE :
+    case IPP_TAG_DELETEATTR :
+    case IPP_TAG_ADMINDEFINE :
+        dstattr = ippAddOutOfBand(dst, srcattr->group_tag, srcattr->value_tag & ~IPP_TAG_CUPS_CONST, srcattr->name);
+        break;
+
     case IPP_TAG_INTEGER :
     case IPP_TAG_ENUM :
         dstattr = ippAddIntegers(dst, srcattr->group_tag, srcattr->value_tag,