test-runner: fix crash if ofono is not installed
PATCH 1/1 test-runner: fix crash if ofono is not installed
The goto was jumping to a label which freed the wiphy list which had not yet been initialized. This also fixes another similar issue if chdir fails (in this case tmpfs_extra_stuff would get freed before being allocated).
--- tools/test-runner.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
tools/test-runner.c +5 -4
@@ -2075,7 +2075,7 @@ static void create_network_and_run_tests(void *data, void *user_data)if (chdir (config_dir_path) <0 ) {l_error ("Failed to change to test directory: %s" ,strerror (errno)); - goto exit_hwsim; + goto free_hw_settings; } tmpfs_extra_stuff =
@@ -2099,7 +2099,7 @@ static void create_network_and_run_tests(void *data, void *user_data)if (!ofono_found || !phonesim_found) {l_info ("ofono or phonesim not found, skipping" ); - goto exit_hwsim; + goto free_tmpfs_extra; } ofono_req = true;
@@ -2270,7 +2270,6 @@ exit_hostapd: remove_abs_paths:remove_absolute_path_dirs (tmpfs_extra_stuff); -exit_hwsim:/* * If running in hwsim mode, we want to completely free/destroy the * wiphy list since it will be re-populated on the next test. For the
@@ -2282,8 +2281,10 @@ exit_hwsim: elsel_queue_foreach (wiphy_list ,wiphy_reset ,NULL ); -l_settings_free (hw_settings); +free_tmpfs_extra:l_strfreev (tmpfs_extra_stuff); +free_hw_settings: +l_settings_free (hw_settings); }struct stat_totals {
Signature · 1 line
2.24.1