diff options
author | Bryan Ferris <bferris@google.com> | 2019-06-25 15:25:14 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-25 15:25:14 -0700 |
commit | 288b900956c1351e5a11f305d57419ca8f3a4efb (patch) | |
tree | 49d34d746db7a890f58b6f17d4327e2f42532bf4 | |
parent | ea4dbcf45095c3f7595176641ddd95824bb8354d (diff) | |
parent | 22ae6269572ef33444a53bcb33d6ef86934d6988 (diff) | |
download | libcups-288b900956c1351e5a11f305d57419ca8f3a4efb.tar.gz |
Fix heap buffer overflow in ipp.c am: b58481780c am: 3ec6f0bd9b am: bae9491cf3android10-dev
am: 22ae626957
Change-Id: I5ef3f90127dd7be6a2f98ef9eaa71b72b48e23da
-rw-r--r-- | cups/ipp.c | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -4628,9 +4628,7 @@ ippSetValueTag( break; case IPP_TAG_NAME : - if (temp_tag != IPP_TAG_KEYWORD && temp_tag != IPP_TAG_URI && - temp_tag != IPP_TAG_URISCHEME && temp_tag != IPP_TAG_LANGUAGE && - temp_tag != IPP_TAG_MIMETYPE) + if (temp_tag != IPP_TAG_KEYWORD) return (0); (*attr)->value_tag = (ipp_tag_t)(IPP_TAG_NAME | ((*attr)->value_tag & IPP_TAG_CUPS_CONST)); @@ -4638,10 +4636,7 @@ ippSetValueTag( case IPP_TAG_NAMELANG : case IPP_TAG_TEXTLANG : - if (value_tag == IPP_TAG_NAMELANG && - (temp_tag != IPP_TAG_NAME && temp_tag != IPP_TAG_KEYWORD && - temp_tag != IPP_TAG_URI && temp_tag != IPP_TAG_URISCHEME && - temp_tag != IPP_TAG_LANGUAGE && temp_tag != IPP_TAG_MIMETYPE)) + if (value_tag == IPP_TAG_NAMELANG && (temp_tag != IPP_TAG_NAME && temp_tag != IPP_TAG_KEYWORD)) return (0); if (value_tag == IPP_TAG_TEXTLANG && temp_tag != IPP_TAG_TEXT) |