From: Karel Zak <kzak@redhat.com>
Date: Thu, 23 Sep 2021 11:08:32 +0000 (+0200)
Subject: lib/env: don't ignore failed malloc
X-Git-Tag: v2.38-rc1~245
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b3d8aad5dcacd7158a91c39a2bffb5b2f26129a;p=thirdparty%2Futil-linux.git

lib/env: don't ignore failed malloc

Fixes: https://github.com/karelzak/util-linux/issues/1434
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/lib/env.c b/lib/env.c
index ac481eea7e..a3dd335bfe 100644
--- a/lib/env.c
+++ b/lib/env.c
@@ -69,6 +69,8 @@ static struct ul_env_list *env_list_add(struct ul_env_list *ls0, const char *str
 
 	sz = strlen(str) + 1;
 	p = malloc(sizeof(struct ul_env_list) + sz);
+	if (!p)
+		return ls0;
 
 	ls = (struct ul_env_list *) p;
 	p += sizeof(struct ul_env_list);
@@ -112,7 +114,7 @@ void env_list_free(struct ul_env_list *ls)
 }
 
 /*
- * Removes unwanted variables from environ[]. If @ls is not NULL than stores
+ * Removes unwanted variables from environ[]. If @org is not NULL than stores
  * unwnated variables to the list.
  */
 void __sanitize_env(struct ul_env_list **org)