CMakeLists.txt

@@ -2,7 +2,7 @@ project(cellframe-sdk C)
 cmake_minimum_required(VERSION 2.8)
 
 set(CMAKE_C_STANDARD 11)
-set(CELLFRAME_SDK_NATIVE_VERSION "2.6-56")
+set(CELLFRAME_SDK_NATIVE_VERSION "2.6-57")
 add_definitions ("-DCELLFRAME_SDK_VERSION=\"${CELLFRAME_SDK_NATIVE_VERSION}\"")
 
 set(DAPSDK_MODULES "")

dap-sdk/net/core/dap_proc_thread.c

@@ -131,23 +131,14 @@ static void s_proc_event_callback(dap_events_socket_t * a_esocket, uint64_t a_va
         bool l_is_finished = l_item->callback(l_thread, l_item->callback_arg);
         if (l_is_finished){
             if(l_item_old){
-                if ( ! l_item->prev ){
+                if ( ! l_item->next ){ // We deleted tail
                     l_thread->proc_queue->item_last = l_item_old;
-                    if (l_thread->proc_queue->item_last)
-                        l_thread->proc_queue->item_last->next = NULL; // Next if it was - now its NULL
                 }
-                if ( ! l_item->next ){
-                    l_thread->proc_queue->item_first = l_item->prev;
-                    if (l_thread->proc_queue->item_first)
-                        l_thread->proc_queue->item_first->prev = NULL; // Prev if it was - now its NULL
-                }
-
-                l_item_old->prev = l_item->prev;
-
+                l_item_old->prev = l_item->next;
                 DAP_DELETE(l_item);
                 l_item = l_item_old->prev;
             }else{
-                l_thread->proc_queue->item_first = l_item->prev;
+                l_thread->proc_queue->item_first = l_item->next;
                 if (l_thread->proc_queue->item_first)
                     l_thread->proc_queue->item_first->prev = NULL; // Prev if it was - now its NULL
                 else

modules/global-db/dap_chain_global_db.c

@@ -859,6 +859,8 @@ char* dap_chain_global_db_hash(const uint8_t *data, size_t data_size)
 void* dap_db_log_unpack(const void *a_data, size_t a_data_size, size_t *a_store_obj_count)
 {
     const dap_store_obj_pkt_t *l_pkt = (const dap_store_obj_pkt_t*) a_data;
+    if (! l_pkt)
+        return NULL;
     if(!l_pkt || l_pkt->data_size != ((size_t) a_data_size - sizeof(dap_store_obj_pkt_t)))
         return NULL;
     size_t l_store_obj_count = 0;