OSDN Git Service

AVRCP: Check the number of text value attributes requested
authorAjay Panicker <apanicke@google.com>
Thu, 11 Jan 2018 00:58:16 +0000 (16:58 -0800)
committerandroid-build-team Robot <android-build-team-robot@google.com>
Wed, 14 Feb 2018 17:17:47 +0000 (17:17 +0000)
Test: Builds
Bug: 69479009
Change-Id: I184ddfdb56c15c2b07d52a2624240738efb4d207
(cherry picked from commit 6313da35abc93fcfb783c68f2e02427df9928ecf)

stack/avrc/avrc_pars_tg.cc

index 1ed6963..99d3c7b 100644 (file)
@@ -220,6 +220,11 @@ static tAVRC_STS avrc_pars_vendor_cmd(tAVRC_MSG_VENDOR* p_msg,
               p_result->get_app_val_txt.num_val)
             status = AVRC_STS_INTERNAL_ERR;
           else {
+            if (p_result->get_app_val_txt.num_val > AVRC_MAX_APP_ATTR_SIZE) {
+              android_errorWriteLog(0x534e4554, "63146237");
+              p_result->get_app_val_txt.num_val = AVRC_MAX_APP_ATTR_SIZE;
+            }
+
             p_u8 = p_result->get_app_val_txt.vals;
             for (xx = 0; xx < p_result->get_app_val_txt.num_val; xx++) {
               p_u8[xx] = *p++;