From 887a76489a2ea864e4ca5a2b44be935a0c794dde Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Sat, 20 Jun 2015 19:26:43 -0600 Subject: [PATCH] malloc() sets errno to ENOMEM on failure so we don't need to set it explicitly. --- plugins/sudoers/env.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/plugins/sudoers/env.c b/plugins/sudoers/env.c index 060a15aa9..1e7f94c16 100644 --- a/plugins/sudoers/env.c +++ b/plugins/sudoers/env.c @@ -307,10 +307,8 @@ sudo_putenv_nodebug(char *str, bool dupcheck, bool overwrite) return -1; } nenvp = reallocarray(env.envp, nsize, sizeof(char *)); - if (nenvp == NULL) { - errno = ENOMEM; + if (nenvp == NULL) return -1; - } env.envp = nenvp; env.env_size = nsize; #ifdef ENV_DEBUG @@ -453,10 +451,8 @@ sudo_setenv_nodebug(const char *var, const char *val, int overwrite) } /* Allocate and fill in estring. */ - if ((estring = ep = malloc(esize)) == NULL) { - errno = ENOMEM; + if ((estring = ep = malloc(esize)) == NULL) goto done; - } for (cp = var; *cp && *cp != '='; cp++) *ep++ = *cp; *ep++ = '='; -- 2.40.0