mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2025-02-02 10:25:22 -05:00
Churn
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
parent
006f128fc5
commit
dfcbf14c17
@ -1,4 +1,4 @@
|
||||
From d8ff0456cbe3b32b5f71dd0740f9a6cca6de27b9 Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Andre Przywara <andre.przywara@arm.com>
|
||||
Date: Mon, 21 Sep 2020 17:52:50 +0100
|
||||
Subject: [PATCH] FROMGIT: libfdt: fdt_offset_ptr(): Fix comparison warnings
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 024bd7b32e3298ceaf70443e9224aff56cf8de4b Mon Sep 17 00:00:00 2001
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Ted Wang <tedwang@google.com>
|
||||
Date: Fri, 1 Apr 2022 11:22:34 +0800
|
||||
Subject: [PATCH] Fix potential interger overflow when parsing vendor response
|
||||
@ -19,10 +19,10 @@ Merged-In: Iea2c3e17c2c8cc56468c4456822e1c4c5c15f5bc
|
||||
2 files changed, 65 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/stack/avrc/avrc_pars_ct.cc b/stack/avrc/avrc_pars_ct.cc
|
||||
index 1ab5479139..3ea798f38d 100644
|
||||
index ef5aa1647..dd22fa3d5 100644
|
||||
--- a/stack/avrc/avrc_pars_ct.cc
|
||||
+++ b/stack/avrc/avrc_pars_ct.cc
|
||||
@@ -228,7 +228,7 @@ static tAVRC_STS avrc_pars_browse_rsp(tAVRC_MSG_BROWSE* p_msg,
|
||||
@@ -230,7 +230,7 @@ static tAVRC_STS avrc_pars_browse_rsp(tAVRC_MSG_BROWSE* p_msg,
|
||||
}
|
||||
BE_STREAM_TO_UINT8(pdu, p);
|
||||
uint16_t pkt_len;
|
||||
@ -31,7 +31,7 @@ index 1ab5479139..3ea798f38d 100644
|
||||
/* read the entire packet len */
|
||||
BE_STREAM_TO_UINT16(pkt_len, p);
|
||||
|
||||
@@ -371,8 +371,14 @@ static tAVRC_STS avrc_pars_browse_rsp(tAVRC_MSG_BROWSE* p_msg,
|
||||
@@ -373,8 +373,14 @@ static tAVRC_STS avrc_pars_browse_rsp(tAVRC_MSG_BROWSE* p_msg,
|
||||
/* Parse the name now */
|
||||
BE_STREAM_TO_UINT16(attr_entry->name.charset_id, p);
|
||||
BE_STREAM_TO_UINT16(attr_entry->name.str_len, p);
|
||||
@ -47,7 +47,7 @@ index 1ab5479139..3ea798f38d 100644
|
||||
attr_entry->name.p_str = (uint8_t*)osi_malloc(
|
||||
attr_entry->name.str_len * sizeof(uint8_t));
|
||||
BE_STREAM_TO_ARRAY(p, attr_entry->name.p_str,
|
||||
@@ -775,8 +781,12 @@ static tAVRC_STS avrc_ctrl_pars_vendor_rsp(tAVRC_MSG_VENDOR* p_msg,
|
||||
@@ -777,8 +783,12 @@ static tAVRC_STS avrc_ctrl_pars_vendor_rsp(tAVRC_MSG_VENDOR* p_msg,
|
||||
BE_STREAM_TO_UINT32(p_attrs[i].attr_id, p);
|
||||
BE_STREAM_TO_UINT16(p_attrs[i].name.charset_id, p);
|
||||
BE_STREAM_TO_UINT16(p_attrs[i].name.str_len, p);
|
||||
@ -62,7 +62,7 @@ index 1ab5479139..3ea798f38d 100644
|
||||
for (int j = 0; j < i; j++) {
|
||||
osi_free(p_attrs[j].name.p_str);
|
||||
}
|
||||
@@ -784,6 +794,7 @@ static tAVRC_STS avrc_ctrl_pars_vendor_rsp(tAVRC_MSG_VENDOR* p_msg,
|
||||
@@ -786,6 +796,7 @@ static tAVRC_STS avrc_ctrl_pars_vendor_rsp(tAVRC_MSG_VENDOR* p_msg,
|
||||
p_result->get_attrs.num_attrs = 0;
|
||||
goto length_error;
|
||||
}
|
||||
@ -71,7 +71,7 @@ index 1ab5479139..3ea798f38d 100644
|
||||
p_attrs[i].name.p_str =
|
||||
(uint8_t*)osi_calloc(p_attrs[i].name.str_len);
|
||||
diff --git a/stack/test/stack_avrcp_test.cc b/stack/test/stack_avrcp_test.cc
|
||||
index d3a51658db..bca30cd1c9 100644
|
||||
index 7bf2f4c9f..1dffd48c9 100644
|
||||
--- a/stack/test/stack_avrcp_test.cc
|
||||
+++ b/stack/test/stack_avrcp_test.cc
|
||||
@@ -27,6 +27,56 @@ class StackAvrcpTest : public ::testing::Test {
|
||||
|
@ -73,7 +73,7 @@ applyPatch "$DOS_PATCHES/android_build/0001-OTA_Keys.patch"; #Add correct keys t
|
||||
applyPatch "$DOS_PATCHES/android_build/0002-Enable_fwrapv.patch"; #Use -fwrapv at a minimum (GrapheneOS)
|
||||
sed -i '57i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches.
|
||||
awk -i inplace '!/Email/' target/product/core.mk; #Remove Email
|
||||
sed -i 's/2021-10-05/2022-09-05/' core/version_defaults.mk; #Bump Security String #XXX
|
||||
sed -i 's/2021-10-05/2022-10-05/' core/version_defaults.mk; #Bump Security String #XXX
|
||||
fi;
|
||||
|
||||
if enterAndClear "build/soong"; then
|
||||
|
@ -71,7 +71,7 @@ buildAll() {
|
||||
buildDevice aurora avb;
|
||||
buildDevice xz2c avb;
|
||||
#SD730
|
||||
#buildDevice sunfish avb; #superseded
|
||||
buildDevice sunfish avb; #superseded
|
||||
#SD632
|
||||
buildDevice FP3 avb;
|
||||
#SD750
|
||||
|
Loading…
x
Reference in New Issue
Block a user