From 8d5bb13d7821da9ea84ccd3c4101aa50f9296022 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 15 Jul 2020 18:49:08 +0200 Subject: [PATCH] core: fix invalid assertion We miscounted here, and would hit an assert once too early. --- src/core/execute.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/core/execute.c b/src/core/execute.c index 3c17c6b5b08..70b7b8dc3c2 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -1725,7 +1725,8 @@ static int build_environment( assert(p); assert(ret); - our_env = new0(char*, 15 + _EXEC_DIRECTORY_TYPE_MAX); +#define N_ENV_VARS 15 + our_env = new0(char*, N_ENV_VARS + _EXEC_DIRECTORY_TYPE_MAX); if (!our_env) return -ENOMEM; @@ -1873,7 +1874,8 @@ static int build_environment( } our_env[n_env++] = NULL; - assert(n_env <= 14 + _EXEC_DIRECTORY_TYPE_MAX); + assert(n_env <= N_ENV_VARS + _EXEC_DIRECTORY_TYPE_MAX); +#undef N_ENV_VARS *ret = TAKE_PTR(our_env); -- 2.47.3