Merge branch 'master' into release-v5.6

elastos · Jun 19, 2020 · 76c935f · 76c935f
2 parents 0d5f2ab + e390c99
commit 76c935f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/carrier/ela_carrier.c b/src/carrier/ela_carrier.c
@@ -1324,7 +1324,7 @@ ElaCarrier *ela_new(const ElaOptions *opts, ElaCallbacks *callbacks,
 
     w->connector = create_express_connector(w);
     if (!w->connector)
-        vlogW("Carrier: Creating express connector error (%d)", ela_get_error());
+        vlogW("Carrier: Creating express connector error (%x)", ela_get_error());
 
     apply_extra_data(w, data.extra_savedata, data.extra_savedata_len);
     free_persistence_data(&data);
@@ -1857,7 +1857,8 @@ static void do_receipts_expire(ElaCarrier *w)
                                       ext_name);
 
             if (rc < 0) {
-                item->callback(item->msgid, ElaReceipt_Error, item->context);
+                if(item->callback != NULL)
+                    item->callback(item->msgid, ElaReceipt_Error, item->context);
                 receipts_iterator_remove(&it);
             }
         }