From 4eb1cc0d69804337ac9e35dea6cc2e22c0fc76c6 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Wed, 7 Jun 2017 01:29:59 +0200 Subject: [PATCH] Fix: exception unsubscribe all at start When unsubscribing but no diagnostic subscription made there is an exception when cleaning empty requests vector. Change-Id: I40bdd01969fd1a1c6fecb0a438c46d0df584de83 Signed-off-by: Romain Forlot --- CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp index ac91ae5b..7dab7495 100644 --- a/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp +++ b/CAN-binder/low-can-binding/diagnostic/diagnostic-manager.cpp @@ -202,7 +202,7 @@ void diagnostic_manager_t::cancel_request(active_diagnostic_request_t* entry) /// @param[in] force - Force the cleaning or not ? void diagnostic_manager_t::cleanup_request(active_diagnostic_request_t* entry, bool force) { - if((force || (entry != nullptr && entry->response_received()))) + if(entry != nullptr && (force || entry->response_received())) { char request_string[128] = {0}; diagnostic_request_to_string(&entry->get_handle()->request, -- 2.16.6