Skip to content
Snippets Groups Projects
Commit 41d18516 authored by Dmitriy A. Gerasimov's avatar Dmitriy A. Gerasimov
Browse files

[*] Check for null unpacked data

parent eec40837
No related branches found
No related tags found
No related merge requests found
Pipeline #6547 passed with stage
in 23 seconds
...@@ -2,7 +2,7 @@ project(cellframe-sdk C) ...@@ -2,7 +2,7 @@ project(cellframe-sdk C)
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD 11)
set(CELLFRAME_SDK_NATIVE_VERSION "2.6-64") set(CELLFRAME_SDK_NATIVE_VERSION "2.6-65")
add_definitions ("-DCELLFRAME_SDK_VERSION=\"${CELLFRAME_SDK_NATIVE_VERSION}\"") add_definitions ("-DCELLFRAME_SDK_VERSION=\"${CELLFRAME_SDK_NATIVE_VERSION}\"")
set(DAPSDK_MODULES "") set(DAPSDK_MODULES "")
......
...@@ -352,8 +352,14 @@ bool s_gdb_pkt_callback(dap_proc_thread_t *a_thread, void *a_arg) ...@@ -352,8 +352,14 @@ bool s_gdb_pkt_callback(dap_proc_thread_t *a_thread, void *a_arg)
size_t l_data_obj_count = 0; size_t l_data_obj_count = 0;
// deserialize data & Parse data from dap_db_log_pack() // deserialize data & Parse data from dap_db_log_pack()
dap_store_obj_t *l_store_obj = dap_db_log_unpack(l_pkt_copy->pkt_data, l_pkt_copy->pkt_data_size, &l_data_obj_count); dap_store_obj_t *l_store_obj = dap_db_log_unpack(l_pkt_copy->pkt_data, l_pkt_copy->pkt_data_size, &l_data_obj_count);
if (s_debug_chain_sync) if (s_debug_chain_sync){
log_it(L_INFO, "In: l_data_obj_count = %d", l_data_obj_count ); if (l_data_obj_count)
log_it(L_INFO, "In: l_data_obj_count = %d", l_data_obj_count );
else if (l_pkt_copy->pkt_data)
log_it(L_WARNING, "In: No data objs after unpack", l_data_obj_count );
else
log_it(L_WARNING, "In: packet in list with NULL data");
}
for(size_t i = 0; i < l_data_obj_count; i++) { for(size_t i = 0; i < l_data_obj_count; i++) {
// timestamp for exist obj // timestamp for exist obj
...@@ -439,8 +445,10 @@ bool s_gdb_pkt_callback(dap_proc_thread_t *a_thread, void *a_arg) ...@@ -439,8 +445,10 @@ bool s_gdb_pkt_callback(dap_proc_thread_t *a_thread, void *a_arg)
} }
if(l_store_obj) if(l_store_obj)
dap_store_obj_free(l_store_obj, l_data_obj_count); dap_store_obj_free(l_store_obj, l_data_obj_count);
DAP_DELETE(l_pkt_copy); if (l_pkt_copy)
DAP_DELETE(l_pkt_copy_list); DAP_DELETE(l_pkt_copy);
if (l_pkt_copy_list)
DAP_DELETE(l_pkt_copy_list);
} else { } else {
log_it(L_WARNING, "In proc thread got GDB stream ch packet with zero data"); log_it(L_WARNING, "In proc thread got GDB stream ch packet with zero data");
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment