system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-09-06 16:56:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

main: fix assertion failure due to use of ELEMENTSOF on a non-array

Browse source
This commit is contained in:
Michal Schmidt 2012-05-09 11:13:26 +02:00
parent f6a6814947
commit e564a98237
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/core/main.c
View file

@ -1640,7 +1640,7 @@ finish:
if (reexecute) {
const char **args;
unsigned i;
unsigned i, args_size;
/* Close and disarm the watchdog, so that the new
* instance can reinitialize it, but doesn't get
@ -1650,7 +1650,8 @@ finish:
if (switch_root)
do_switch_root(switch_root);
args = newa(const char*, MAX(5, argc+1));
args_size = MAX(5, argc+1);
args = newa(const char*, args_size);
if (!switch_root_init) {
char sfd[16];
@ -1673,7 +1674,7 @@ finish:
args[i++] = sfd;
args[i++] = NULL;
assert(i <= ELEMENTSOF(args));
assert(i <= args_size);
execv(args[0], (char* const*) args);
}
@ -1695,7 +1696,7 @@ finish:
args[i++] = argv[j];
args[i++] = NULL;
assert(i <= ELEMENTSOF(args));
assert(i <= args_size);
execv(args[0], (char* const*) args);
log_error("Failed to reexecute: %m");