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

Commit 28b4c5ca authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Security: Fix out of bound read in AT_SKIP_REST" into tm-dev am: 6e1ac9db am: 9d98d78c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/18231624



Change-Id: Iff7e78057ae05f3b984df05f2b75db9d326c283e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c6d83538 9d98d78c

system/bta/hf_client/bta_hf_client_at.cc

+3 −3
Original line number Diff line number Diff line
@@ -818,7 +818,7 @@ void bta_hf_client_binp(tBTA_HF_CLIENT_CB* client_cb, char* number) { 
/* skip rest of AT string up to <cr> */

#define AT_SKIP_REST(buf)                             \

  do {                                                \

    while (*(buf) != '\r') (buf)++; \

    while (*(buf) != '\r' && *(buf) != '\0') (buf)++; \

  } while (0)



static char* bta_hf_client_parse_ok(tBTA_HF_CLIENT_CB* client_cb,