From: Frantisek Sumsal Date: Sun, 30 Jan 2022 14:49:27 +0000 (+0100) Subject: core: check argc/argv uncoditionally X-Git-Tag: v251-rc1~411 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61b9769bda465f4832080e2a7a8285d247121d70;p=thirdparty%2Fsystemd.git core: check argc/argv uncoditionally as `assert()` might be dropped with `-DNDEBUG`. Follow-up to cf3095a and 1637e75. --- diff --git a/src/core/main.c b/src/core/main.c index fba9a4a8ec3..f347b74b11c 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -2726,7 +2726,7 @@ int main(int argc, char *argv[]) { Manager *m = NULL; FDSet *fds = NULL; - assert(argc > 0 && !isempty(argv[0])); + assert_se(argc > 0 && !isempty(argv[0])); /* SysV compatibility: redirect init → telinit */ redirect_telinit(argc, argv); diff --git a/src/shared/main-func.h b/src/shared/main-func.h index 09103bace96..81a5c1813cb 100644 --- a/src/shared/main-func.h +++ b/src/shared/main-func.h @@ -15,7 +15,7 @@ #define _DEFINE_MAIN_FUNCTION(intro, impl, ret) \ int main(int argc, char *argv[]) { \ int r; \ - assert(argc > 0 && !isempty(argv[0])); \ + assert_se(argc > 0 && !isempty(argv[0])); \ save_argc_argv(argc, argv); \ intro; \ r = impl; \