10:13 a.m.
Use l_settings_get_value instead of l_settings_get_string to
prevent unnecessary memory duplication.
---
tools/test-runner.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/test-runner.c b/tools/test-runner.c
index 4551c6c1..430e18e3 100644
--- a/tools/test-runner.c
+++ b/tools/test-runner.c
@@ -1961,8 +1961,8 @@ static void create_network_and_run_tests(void *data, void
*user_data)
HW_CONFIG_SETUP_TMPFS_EXTRAS,
':');
- sim_keys = l_settings_get_string(hw_settings, HW_CONFIG_GROUP_SETUP,
- "sim_keys");
+ sim_keys = l_settings_get_value(hw_settings, HW_CONFIG_GROUP_SETUP,
+ "sim_keys");
if (sim_keys) {
if (!strcmp(sim_keys, "ofono")) {
--
2.13.6
10:13 a.m.
New subject: [PATCH 2/7] t-runner: Fix mem leak caused by unclosed dir
---
tools/test-runner.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/test-runner.c b/tools/test-runner.c
index 430e18e3..5045984c 100644
--- a/tools/test-runner.c
+++ b/tools/test-runner.c
@@ -2413,6 +2413,8 @@ next:
l_free(unit_test_abs_path);
}
+ closedir(d);
+
exit:
l_strfreev(unit_tests);
}
--
2.13.6
10:13 a.m.
New subject: [PATCH 3/7] t-runner: Fix mem leak caused by python test names
---
tools/test-runner.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/test-runner.c b/tools/test-runner.c
index 5045984c..faa5dfa1 100644
--- a/tools/test-runner.c
+++ b/tools/test-runner.c
@@ -1089,6 +1089,8 @@ static bool add_path(const char *path, int level, struct l_queue
*config_queue)
l_queue_insert(config_queue, entry, insert_test_entry, NULL);
}
+ l_queue_destroy(py_test_queue, l_free);
+
closedir(dir);
return true;
}
--
2.13.6
10:13 a.m.
New subject: [PATCH 4/7] t-runner: Fix out-of-bounds write
---
tools/test-runner.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/test-runner.c b/tools/test-runner.c
index faa5dfa1..2dc19726 100644
--- a/tools/test-runner.c
+++ b/tools/test-runner.c
@@ -1636,7 +1636,7 @@ static void print_test_status(char *test_name, enum test_status ts,
interval_str = l_malloc(int_len);
memset(interval_str, ' ', int_len);
- interval_str[int_len] = '\0';
+ interval_str[int_len - 1] = '\0';
if (interval > 0)
sprintf(interval_str, "%.3f sec", interval);
--
2.13.6
10:13 a.m.
New subject: [PATCH 5/7] t-runner: Fix possible assignment of NULL pointer
---
tools/test-runner.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/test-runner.c b/tools/test-runner.c
index 2dc19726..0226dd15 100644
--- a/tools/test-runner.c
+++ b/tools/test-runner.c
@@ -2674,7 +2674,8 @@ static void run_tests(void)
test_action_str = ptr + 4;
ptr = strchr(test_action_str, '\'');
- *ptr = '\0';
+ if (ptr)
+ *ptr = '\0';
if (!strcmp(test_action_str, "virtual"))
native_hw = false;
--
2.13.6
10:13 a.m.
New subject: [PATCH 6/7] t-runner: Check for NULL before using strcmp
---
tools/test-runner.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/test-runner.c b/tools/test-runner.c
index 0226dd15..398494e6 100644
--- a/tools/test-runner.c
+++ b/tools/test-runner.c
@@ -2957,9 +2957,9 @@ int main(int argc, char *argv[])
break;
case 'g':
gdb_opt = optarg;
- if (!(!strcmp(gdb_opt, "iwd") ||
- !strcmp(gdb_opt, "hostapd") ||
- !strcmp(gdb_opt, "hwsim"))) {
+ if (!gdb_opt || (strcmp(gdb_opt, "iwd") &&
+ strcmp(gdb_opt, "hostapd") &&
+ strcmp(gdb_opt, "hwsim"))) {
l_error("--gdb can only be used with iwd"
", hwsim or hostapd");
return EXIT_FAILURE;
--
2.13.6
10:13 a.m.
New subject: [PATCH 7/7] t-runner: Check for errors after opening file
---
tools/test-runner.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/test-runner.c b/tools/test-runner.c
index 398494e6..1dfdb9af 100644
--- a/tools/test-runner.c
+++ b/tools/test-runner.c
@@ -524,6 +524,9 @@ static pid_t execute_program(char *argv[], char *envp[], bool wait,
S_IRUSR | S_IWUSR);
}
+ if (fd == -1)
+ exit(EXIT_FAILURE);
+
dup2(fd, 1);
dup2(fd, 2);
--
2.13.6
1061
days inactive
1062
days old
7 comments
2 participants
participants (2)
-
Denis Kenzior -
Tim Kourt