diff options
| author | Yuchi <yt8mn@virginia.edu> | 2017-02-05 19:33:47 -0500 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-02-14 10:27:08 +0000 |
| commit | b37fce59cb7c48776361ac8cb8a808793016eefd (patch) | |
| tree | 6eda75be64ab79bdc1e90e3ec73e8ae9a05e7d4d /ssl/ssl_ciph.c | |
| parent | 955286c9f38c11b8be719d632fa9267eb13467f8 (diff) | |
mem leak on error path and error propagation fix
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2559)
(cherry picked from commit e0670973d5c0b837eb5a9f1670e47107f466fbc7)
Diffstat (limited to 'ssl/ssl_ciph.c')
| -rw-r--r-- | ssl/ssl_ciph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 99b64bb967..dad2ec176d 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -1827,7 +1827,7 @@ int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm) if (id < 193 || id > 255) { SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE); - return 0; + return 1; } CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE); |