Commit c2cb1a18 authored by Matt Caswell's avatar Matt Caswell Committed by Paul Yang
Browse files

Fix a mem leak on error in the PSK code



Thanks to @fangang190 for reporting this issue.

Fixes #7060

Reviewed-by: default avatarPaul Yang <yang.yang@baishancloud.com>
(Merged from https://github.com/openssl/openssl/pull/7065)
parent 307a494e
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -4621,6 +4621,7 @@ int ssl_generate_master_secret(SSL *s, unsigned char *pms, size_t pmslen,
        if (!s->method->ssl3_enc->generate_master_secret(s,
                    s->session->master_key,pskpms, pskpmslen,
                    &s->session->master_key_length)) {
            OPENSSL_clear_free(pskpms, pskpmslen);
            /* SSLfatal() already called */
            goto err;
        }