From 43622b6eed32aece624a293167a6d705c08b8d03 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Sun, 30 Jan 2022 15:49:27 +0100 Subject: [PATCH] core: check argc/argv uncoditionally as `assert()` might be dropped with `-DNDEBUG`. Follow-up to cf3095a and 1637e75. (cherry picked from commit 61b9769bda465f4832080e2a7a8285d247121d70) Related: #2017035 --- src/core/main.c | 2 +- src/shared/main-func.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/main.c b/src/core/main.c index f315a44a08..cb3131c12a 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 09103bace9..81a5c1813c 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; \