From 5182612d58b1670008b37f64fc92fc32382bd2d5 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 7 Nov 2016 08:03:10 +0100 Subject: [PATCH 1/1] cmocka: Leave if expected_call is NULL CID 1365415 Signed-off-by: Andreas Schneider --- src/cmocka.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cmocka.c b/src/cmocka.c index e21ad26..6c79a20 100644 --- a/src/cmocka.c +++ b/src/cmocka.c @@ -914,15 +914,16 @@ void _function_called(const char *const function, { ListNode *first_value_node = NULL; ListNode *value_node = NULL; - FuncOrderingValue *expected_call; int rc; rc = list_first(&global_call_ordering_head, &value_node); first_value_node = value_node; if (rc) { + FuncOrderingValue *expected_call; int cmp; expected_call = (FuncOrderingValue *)value_node->value; + cmp = strcmp(expected_call->function, function); if (value_node->refcount < -1) { /* @@ -948,7 +949,7 @@ void _function_called(const char *const function, cmp = strcmp(expected_call->function, function); } - if (value_node == first_value_node->prev) { + if (expected_call == NULL || value_node == first_value_node->prev) { cm_print_error(SOURCE_LOCATION_FORMAT ": error: No expected mock calls matching " "called() invocation in %s", -- 2.7.4