Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da7bc1ae authored by Ajay Panicker's avatar Ajay Panicker Committed by android-build-merger
Browse files

Merge "AVRCP: Set maximum string length when copying to buffer" into oc-dev 

am: e99b1ff8

Change-Id: I3c1f67e53bfcd0b202fab9ecaaefc0eb413c0b67
parents 16bf0d1d e99b1ff8

system/stack/avrc/avrc_pars_tg.cc

+5 −2
Original line number Diff line number Diff line
@@ -497,8 +497,11 @@ static tAVRC_STS avrc_pars_browsing_cmd(tAVRC_MSG_BROWSE* p_msg, 
      BE_STREAM_TO_UINT16(p_result->search.string.str_len, p);

      p_result->search.string.p_str = p_buf;

      if (p_buf) {

        if (buf_len > p_result->search.string.str_len)

          buf_len = p_result->search.string.str_len;

        if (p_result->search.string.str_len > buf_len) {

          p_result->search.string.str_len = buf_len;

        } else {

          android_errorWriteLog(0x534e4554, "63146237");

        }

        BE_STREAM_TO_ARRAY(p, p_buf, p_result->search.string.str_len);

      } else {

        status = AVRC_STS_INTERNAL_ERR;