From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Fri, 28 Jan 2022 20:44:32 +0000 (+0100)
Subject: shared: be extra paranoid and check if argc > 0
X-Git-Tag: v251-rc1~423
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1637e75;p=thirdparty%2Fsystemd.git

shared: be extra paranoid and check if argc > 0

and also if argv[0] is non-empty as a precaution for issues similar to
CVE-2021-4034.
---

diff --git a/src/shared/main-func.h b/src/shared/main-func.h
index 05cdffeec00..09103bace96 100644
--- a/src/shared/main-func.h
+++ b/src/shared/main-func.h
@@ -15,6 +15,7 @@
 #define _DEFINE_MAIN_FUNCTION(intro, impl, ret)                         \
         int main(int argc, char *argv[]) {                              \
                 int r;                                                  \
+                assert(argc > 0 && !isempty(argv[0]));                  \
                 save_argc_argv(argc, argv);                             \
                 intro;                                                  \
                 r = impl;                                               \