OSDN Git Service
(root)
/
android-x86
/
system-bt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2f425ed
)
DO NOT MERGE Fix OOB read in avrc_ctrl_pars_vendor_rsp
author
Hansong Zhang
<hsz@google.com>
Mon, 6 Aug 2018 21:36:41 +0000
(14:36 -0700)
committer
Ryan Longair
<rlongair@google.com>
Wed, 15 Aug 2018 20:24:05 +0000
(13:24 -0700)
Bug:
78526423
Test: manual
Change-Id: I0eeacc6a25b12f4b999098375d0d032cfa462a91
(cherry picked from commit
082353ad14082babaf8bcb1fba000b3cf1450c11
)
stack/avrc/avrc_pars_ct.c
patch
|
blob
|
history
diff --git
a/stack/avrc/avrc_pars_ct.c
b/stack/avrc/avrc_pars_ct.c
index
018870a
..
038b6a5
100644
(file)
--- a/
stack/avrc/avrc_pars_ct.c
+++ b/
stack/avrc/avrc_pars_ct.c
@@
-251,6
+251,11
@@
static tAVRC_STS avrc_ctrl_pars_vendor_rsp(
break;
}
BE_STREAM_TO_UINT8(p_result->list_app_values.num_val, p);
+ if (p_result->list_app_values.num_val > AVRC_MAX_APP_ATTR_SIZE) {
+ android_errorWriteLog(0x534e4554, "78526423");
+ p_result->list_app_values.num_val = AVRC_MAX_APP_ATTR_SIZE;
+ }
+
AVRC_TRACE_DEBUG("%s value count = %d ", __func__, p_result->list_app_values.num_val);
for(int xx = 0; xx < p_result->list_app_values.num_val; xx++)
{