Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-01 18:50:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(ble_log): fix size_info nibble misalignment for last odd-count arg

Browse Source 
(cherry picked from commit f5a927e055)

Co-authored-by: luoxu <luoxu@espressif.com>
This commit is contained in:
Luo Xu
2026-07-21 15:01:23 +08:00
committed by luoxu
parent fa0817fd45
commit 975c30ad97
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bt/common/ble_log/extension/log_compression/ble_log_compression.c
+1 -5
View File
@@ -128,7 +128,7 @@ int ble_log_compressed_hex_print_internal(ble_cp_log_buffer_mgmt_t *mgmt, uint32
} else {
arg_type = va_arg(args, size_t);
if (i == args_cnt - 1) {
ble_log_cp_push_u8(mgmt, arg_type);
ble_log_cp_push_u8(mgmt, arg_type << 4);
} else {
size_info = arg_type << 4;
}
@@ -280,11 +280,7 @@ int ble_log_compressed_hex_print_buf(uint8_t source, uint32_t log_index, uint8_t
return 0;
}
<<<<<<< HEAD
if (buf == NULL && len != 0) {
=======
if (buf == NULL) {
>>>>>>> 3f2b6c97f86 (fix(ble_log): fix unaligned access and buffer safety in log compression)
ble_log_cp_push_u8(mgmt, LOG_HEADER(LOG_TYPE_INFO, LOG_TYPE_INFO_NULL_BUF));
ble_log_cp_push_u16(mgmt, log_index);
ble_compressed_log_output(source, mgmt->buffer, mgmt->idx);