Skip to content

Commit

Permalink
Fix a memory leak in an error path
Browse files Browse the repository at this point in the history
Found by Coverity.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from #5970)
  • Loading branch information
mattcaswell committed Apr 17, 2018
1 parent a682365 commit 9f2a3bb
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions crypto/srp/srp_vfy.c
Expand Up @@ -69,8 +69,10 @@ static int t_fromb64(unsigned char *a, size_t alen, const char *src)
* 4 bytes unencoded = 6 bytes encoded
* etc
*/
if (padsize == 3)
return -1;
if (padsize == 3) {
outl = -1;
goto err;
}

/* Valid padsize values are now 0, 1 or 2 */

Expand All @@ -80,21 +82,24 @@ static int t_fromb64(unsigned char *a, size_t alen, const char *src)
/* Add any encoded padding that is required */
if (padsize != 0
&& EVP_DecodeUpdate(ctx, a, &outl, pad, padsize) < 0) {
EVP_ENCODE_CTX_free(ctx);
return -1;
outl = -1;
goto err;
}
if (EVP_DecodeUpdate(ctx, a, &outl2, (const unsigned char *)src, size) < 0) {
EVP_ENCODE_CTX_free(ctx);
return -1;
outl = -1;
goto err;
}
outl += outl2;
EVP_DecodeFinal(ctx, a + outl, &outl2);
outl += outl2;

/* Strip off the leading padding */
if (padsize != 0) {
if ((int)padsize >= outl)
return -1;
if ((int)padsize >= outl) {
outl = -1;
goto err;
}

/*
* If we added 1 byte of padding prior to encoding then we have 2 bytes
* of "real" data which gets spread across 4 encoded bytes like this:
Expand All @@ -112,6 +117,7 @@ static int t_fromb64(unsigned char *a, size_t alen, const char *src)
outl -= padsize;
}

err:
EVP_ENCODE_CTX_free(ctx);

return outl;
Expand Down

0 comments on commit 9f2a3bb

Please sign in to comment.