From: Christopher Peplin <chris.peplin@rhubarbtech.com>
Date: Thu, 2 Jan 2014 17:10:14 +0000 (-0500)
Subject: Avoid hitting a NULL pointer when using callbacks.
X-Git-Tag: 3.99.1~104^2~25
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=fe20a273bb3979d9e806d828486633249d073ede;p=apps%2Flow-level-can-service.git

Avoid hitting a NULL pointer when using callbacks.
---

diff --git a/src/isotp/receive.c b/src/isotp/receive.c
index fa96156..1692f8d 100644
--- a/src/isotp/receive.c
+++ b/src/isotp/receive.c
@@ -6,7 +6,9 @@ bool isotp_handle_single_frame(IsoTpHandle* handle, IsoTpMessage* message) {
 }
 
 void isotp_complete_receive(IsoTpHandle* handle, IsoTpMessage* message) {
-    handle->receive_handle.message_received_callback(message);
+    if(handle->receive_handle.message_received_callback != NULL) {
+        handle->receive_handle.message_received_callback(message);
+    }
 }
 
 IsoTpHandle isotp_receive(IsoTpShims* shims,
diff --git a/src/isotp/send.c b/src/isotp/send.c
index 6cce5c9..85e3574 100644
--- a/src/isotp/send.c
+++ b/src/isotp/send.c
@@ -6,7 +6,9 @@
 
 void isotp_complete_send(IsoTpShims* shims, IsoTpMessage* message,
         bool status, IsoTpMessageSentHandler callback) {
-    callback(message, status);
+    if(callback != NULL) {
+        callback(message, status);
+    }
 }
 
 IsoTpHandle isotp_send_single_frame(IsoTpShims* shims, IsoTpMessage* message,