From 4a058ae0f5b58b87ebb568c13fcf4a91fbbb797b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Thu, 25 Apr 2024 20:24:12 +0200 Subject: [PATCH] trigger: remove check of NULL pointers before calling trigger_free() (issue #865) --- src/plugins/trigger/trigger-command.c | 3 +-- tests/unit/plugins/trigger/test-trigger.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/plugins/trigger/trigger-command.c b/src/plugins/trigger/trigger-command.c index 8491ea1fc..b663bb61e 100644 --- a/src/plugins/trigger/trigger-command.c +++ b/src/plugins/trigger/trigger-command.c @@ -1161,8 +1161,7 @@ trigger_command_trigger (const void *pointer, void *data, } else { - if (ptr_trigger) - trigger_free (ptr_trigger); + trigger_free (ptr_trigger); ptr_trigger = trigger_new ( trigger_config_default_list[j][0], /* name */ trigger_config_default_list[j][1], /* enabled */ diff --git a/tests/unit/plugins/trigger/test-trigger.cpp b/tests/unit/plugins/trigger/test-trigger.cpp index cc974051c..a0b77a020 100644 --- a/tests/unit/plugins/trigger/test-trigger.cpp +++ b/tests/unit/plugins/trigger/test-trigger.cpp @@ -629,7 +629,7 @@ TEST(Trigger, New) POINTERS_EQUAL(NULL, trigger_search_with_option (NULL)); POINTERS_EQUAL(NULL, trigger_search_with_option (config_look_day_change)); - /* invalid free */ + /* test free of NULL trigger */ trigger_free (NULL); }