picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

systemctl: fix how we decode types and states 

There was a bad memory access among other smaller issues.
This commit is contained in:
Lennart Poettering 2015-10-01 14:27:20 +02:00
parent 3d3145100d
commit 7e9d36e06b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/systemctl/systemctl.c
View File

@ -6648,7 +6648,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
}
if (unit_type_from_string(type) >= 0) {
if (strv_push(&arg_types, type))
if (strv_push(&arg_types, type) < 0)
return log_oom();
type = NULL;
continue;
@ -6658,7 +6658,7 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
* load states, but let's support this
* in --types= too for compatibility
* with old versions */
if (unit_load_state_from_string(optarg) >= 0) {
if (unit_load_state_from_string(type) >= 0) {
if (strv_push(&arg_states, type) < 0)
return log_oom();
type = NULL;
@ -6871,8 +6871,10 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
return 0;
}
if (strv_consume(&arg_states, s) < 0)
if (strv_push(&arg_states, s) < 0)
return log_oom();
s = NULL;
}
break;
}