diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-03-19 04:53:25 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-03-19 04:53:25 +0000 |
| commit | c04eaf31b67e0657372d6bb7a33db4385c622354 (patch) | |
| tree | e586ea9cd998922f1a6e6eebd0255bc076e8b159 | |
| parent | 2f320d60bcc8ab32971eed163df3fca79c792fd1 (diff) | |
| parent | 6b7373a32e0a0628b497c1fbec5141ca47ef61b5 (diff) | |
| download | bt-android10-qpr2-s3-release.tar.gz | |
Merge cherrypicks of [10745155, 10743283, 10746098, 10735615, 10743284, 10745369, 10745156, 10745157, 10746136, 10746137, 10745215, 10746138, 10745216, 10745217, 10746139, 10745218, 10743285, 10746118, 10746119, 10745827, 10745158, 10745159, 10743224, 10743225, 10745492] into qt-qpr2-releaseandroid-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-release
Change-Id: Ia1240e033cff4ac89193762f896a4fdd4e7e50b7
| -rw-r--r-- | service/gatt_server.cc | 7 | ||||
| -rw-r--r-- | stack/a2dp/a2dp_aac_decoder.cc | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/service/gatt_server.cc b/service/gatt_server.cc index 52fd1edf6..f46927d70 100644 --- a/service/gatt_server.cc +++ b/service/gatt_server.cc @@ -18,6 +18,7 @@ #include <base/logging.h> +#include "osi/include/log.h" #include "service/logging_helpers.h" #include "stack/include/bt_types.h" @@ -116,6 +117,12 @@ bool GattServer::SendResponse(const std::string& device_address, int request_id, return false; } + if (offset < 0) { + android_errorWriteLog(0x534e4554, "143231677"); + LOG(ERROR) << "Offset is less than 0 offset: " << offset; + return false; + } + if (value.size() + offset > BTGATT_MAX_ATTR_LEN) { LOG(ERROR) << "Value is too large"; return false; diff --git a/stack/a2dp/a2dp_aac_decoder.cc b/stack/a2dp/a2dp_aac_decoder.cc index d9cd85dc6..d998d7d47 100644 --- a/stack/a2dp/a2dp_aac_decoder.cc +++ b/stack/a2dp/a2dp_aac_decoder.cc @@ -30,7 +30,7 @@ typedef struct { HANDLE_AACDECODER aac_handle; bool has_aac_handle; // True if aac_handle is valid - INT_PCM* decode_buf; + INT_PCM* decode_buf = nullptr; decoded_data_callback_t decode_callback; } tA2DP_AAC_DECODER_CB; @@ -58,7 +58,7 @@ bool a2dp_aac_decoder_init(decoded_data_callback_t decode_callback) { void a2dp_aac_decoder_cleanup(void) { if (a2dp_aac_decoder_cb.has_aac_handle) aacDecoder_Close(a2dp_aac_decoder_cb.aac_handle); - free(a2dp_aac_decoder_cb.decode_buf); + osi_free(a2dp_aac_decoder_cb.decode_buf); memset(&a2dp_aac_decoder_cb, 0, sizeof(a2dp_aac_decoder_cb)); } |