62 lines
1.9 KiB
Diff
62 lines
1.9 KiB
Diff
From dd05385e36582f34e691b1350dd7daf74df5cc90 Mon Sep 17 00:00:00 2001
|
|
From: Peiwei Hu <jlu.hpw@foxmail.com>
|
|
Date: Tue, 4 Jan 2022 09:10:32 +0800
|
|
Subject: [PATCH] apps/passwd.c: free before error exiting
|
|
|
|
use goto instead of returning directly while error handling
|
|
|
|
Signed-off-by: Peiwei Hu <jlu.hpw@foxmail.com>
|
|
|
|
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
|
|
Reviewed-by: Paul Dale <pauli@openssl.org>
|
|
Reviewed-by: Tomas Mraz <tomas@openssl.org>
|
|
(Merged from https://github.com/openssl/openssl/pull/17404)
|
|
|
|
(cherry picked from commit ea4d16bc60dee53feb71997c1e78379eeb69b7ac)
|
|
---
|
|
apps/passwd.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/apps/passwd.c b/apps/passwd.c
|
|
index d741d05335..2a4199d080 100644
|
|
--- a/apps/passwd.c
|
|
+++ b/apps/passwd.c
|
|
@@ -407,7 +407,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
|
|
n >>= 1;
|
|
}
|
|
if (!EVP_DigestFinal_ex(md, buf, NULL))
|
|
- return NULL;
|
|
+ goto err;
|
|
|
|
for (i = 0; i < 1000; i++) {
|
|
if (!EVP_DigestInit_ex(md2, EVP_md5(), NULL))
|
|
@@ -633,7 +633,7 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
|
|
n >>= 1;
|
|
}
|
|
if (!EVP_DigestFinal_ex(md, buf, NULL))
|
|
- return NULL;
|
|
+ goto err;
|
|
|
|
/* P sequence */
|
|
if (!EVP_DigestInit_ex(md2, sha, NULL))
|
|
@@ -644,7 +644,7 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
|
|
goto err;
|
|
|
|
if (!EVP_DigestFinal_ex(md2, temp_buf, NULL))
|
|
- return NULL;
|
|
+ goto err;
|
|
|
|
if ((p_bytes = OPENSSL_zalloc(passwd_len)) == NULL)
|
|
goto err;
|
|
@@ -661,7 +661,7 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
|
|
goto err;
|
|
|
|
if (!EVP_DigestFinal_ex(md2, temp_buf, NULL))
|
|
- return NULL;
|
|
+ goto err;
|
|
|
|
if ((s_bytes = OPENSSL_zalloc(salt_len)) == NULL)
|
|
goto err;
|
|
--
|
|
2.33.0
|