diff options
author | Bryan Ferris <bferris@google.com> | 2019-06-25 13:33:15 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-25 13:33:15 -0700 |
commit | 3ec6f0bd9ba5b3940580dfa046780c0fe517ffeb (patch) | |
tree | 8a7dcedd75862c0c5815ad6e47a5860ca3d388da | |
parent | 11d81482dc275593ad6859917b7dd57725e50aad (diff) | |
parent | b58481780c9e85fc71c990f90f0dcdbdcee8fc00 (diff) | |
download | libcups-3ec6f0bd9ba5b3940580dfa046780c0fe517ffeb.tar.gz |
Fix heap buffer overflow in ipp.c
am: b58481780c
Change-Id: Ie03d58011552dff6fdd739663936d9dc7aff3d85
-rw-r--r-- | cups/ipp.c | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -4607,9 +4607,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)); @@ -4617,10 +4615,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) |