mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-06-26 14:42:13 +00:00
202033c013
This adds 3 expat patches for n-asb-2022-09 from https://github.com/syphyr/android_external_expat/commits/cm-14.1 and also applies 2 of them to 15.1 Signed-off-by: Tad <tad@spotco.us>
30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Josh Wu <joshwu@google.com>
|
|
Date: Fri, 29 Apr 2022 00:02:23 -0700
|
|
Subject: [PATCH] Security: Fix out of bound read in AT_SKIP_REST
|
|
|
|
Bug: 220732646
|
|
Test: build
|
|
Tag: #security
|
|
Ignore-AOSP-First: Security bug
|
|
Change-Id: Ia49f26e4979f9e57c448190a52d0d01b70e342c4
|
|
(cherry picked from commit 4ce5a3c374fb5d24f367a202a6a3dcab4ba4dffd)
|
|
Merged-In: Ia49f26e4979f9e57c448190a52d0d01b70e342c4
|
|
---
|
|
bta/hf_client/bta_hf_client_at.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/bta/hf_client/bta_hf_client_at.c b/bta/hf_client/bta_hf_client_at.c
|
|
index f790dd432..695c4fb32 100644
|
|
--- a/bta/hf_client/bta_hf_client_at.c
|
|
+++ b/bta/hf_client/bta_hf_client_at.c
|
|
@@ -622,7 +622,7 @@ static void bta_hf_client_handle_cgmm(char *manf_model)
|
|
buf += sizeof("\r\n") - 1;
|
|
|
|
/* skip rest of AT string up to <cr> */
|
|
-#define AT_SKIP_REST(buf) while(*buf != '\r') buf++;
|
|
+#define AT_SKIP_REST(buf) while(*buf != '\r' && *buf != '\0') buf++;
|
|
|
|
static char *bta_hf_client_parse_ok(char *buffer)
|
|
{
|