|
 |
8d419f |
From 43622b6eed32aece624a293167a6d705c08b8d03 Mon Sep 17 00:00:00 2001
|
|
|
8d419f |
From: Frantisek Sumsal <frantisek@sumsal.cz>
|
|
|
8d419f |
Date: Sun, 30 Jan 2022 15:49:27 +0100
|
|
|
8d419f |
Subject: [PATCH] core: check argc/argv uncoditionally
|
|
|
8d419f |
|
|
|
8d419f |
as `assert()` might be dropped with `-DNDEBUG`.
|
|
|
8d419f |
|
|
|
8d419f |
Follow-up to cf3095a and 1637e75.
|
|
|
8d419f |
|
|
|
8d419f |
(cherry picked from commit 61b9769bda465f4832080e2a7a8285d247121d70)
|
|
|
8d419f |
|
|
|
8d419f |
Related: #2017035
|
|
|
8d419f |
---
|
|
|
8d419f |
src/core/main.c | 2 +-
|
|
|
8d419f |
src/shared/main-func.h | 2 +-
|
|
|
8d419f |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
8d419f |
|
|
|
8d419f |
diff --git a/src/core/main.c b/src/core/main.c
|
|
|
8d419f |
index f315a44a08..cb3131c12a 100644
|
|
|
8d419f |
--- a/src/core/main.c
|
|
|
8d419f |
+++ b/src/core/main.c
|
|
|
8d419f |
@@ -2726,7 +2726,7 @@ int main(int argc, char *argv[]) {
|
|
|
8d419f |
Manager *m = NULL;
|
|
|
8d419f |
FDSet *fds = NULL;
|
|
|
8d419f |
|
|
|
8d419f |
- assert(argc > 0 && !isempty(argv[0]));
|
|
|
8d419f |
+ assert_se(argc > 0 && !isempty(argv[0]));
|
|
|
8d419f |
|
|
|
8d419f |
/* SysV compatibility: redirect init → telinit */
|
|
|
8d419f |
redirect_telinit(argc, argv);
|
|
|
8d419f |
diff --git a/src/shared/main-func.h b/src/shared/main-func.h
|
|
|
8d419f |
index 09103bace9..81a5c1813c 100644
|
|
|
8d419f |
--- a/src/shared/main-func.h
|
|
|
8d419f |
+++ b/src/shared/main-func.h
|
|
|
8d419f |
@@ -15,7 +15,7 @@
|
|
|
8d419f |
#define _DEFINE_MAIN_FUNCTION(intro, impl, ret) \
|
|
|
8d419f |
int main(int argc, char *argv[]) { \
|
|
|
8d419f |
int r; \
|
|
|
8d419f |
- assert(argc > 0 && !isempty(argv[0])); \
|
|
|
8d419f |
+ assert_se(argc > 0 && !isempty(argv[0])); \
|
|
|
8d419f |
save_argc_argv(argc, argv); \
|
|
|
8d419f |
intro; \
|
|
|
8d419f |
r = impl; \
|