diff options
author | Peiwei Hu <jlu.hpw@foxmail.com> | 2022-01-04 09:10:32 +0800 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2022-01-05 10:02:45 +0100 |
commit | dd05385e36582f34e691b1350dd7daf74df5cc90 (patch) | |
tree | 8f6f4f7636e067800bd5eb07ac367184eb806c1a | |
parent | 692520a1fede55001dbce23618f992b4042ebbae (diff) |
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)
-rw-r--r-- | apps/passwd.c | 8 |
1 files 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; |