summaryrefslogtreecommitdiffstats
path: root/ssl/bio_ssl.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-03-24 15:10:15 +0000
committerMatt Caswell <matt@openssl.org>2015-03-25 18:52:13 +0000
commit17dd65e6e1f888b4561d559b4d44fbbe0a0aa3e7 (patch)
treee1b6a255d4d7dd7eb37734b4208af8598a3078be /ssl/bio_ssl.c
parentcb14aec713ccab92d1c21d3d5b066570c4bca5ee (diff)
Resolve swallowed returns codes
The recent updates to libssl to enforce stricter return code checking, left a small number of instances behind where return codes were being swallowed (typically because the function they were being called from was declared as void). This commit fixes those instances to handle the return codes more appropriately. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/bio_ssl.c')
-rw-r--r--ssl/bio_ssl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
index 11a2aadc5f..0344b7e35b 100644
--- a/ssl/bio_ssl.c
+++ b/ssl/bio_ssl.c
@@ -556,7 +556,8 @@ int BIO_ssl_copy_session_id(BIO *t, BIO *f)
if ((((BIO_SSL *)t->ptr)->ssl == NULL) ||
(((BIO_SSL *)f->ptr)->ssl == NULL))
return (0);
- SSL_copy_session_id(((BIO_SSL *)t->ptr)->ssl, ((BIO_SSL *)f->ptr)->ssl);
+ if(!SSL_copy_session_id(((BIO_SSL *)t->ptr)->ssl, ((BIO_SSL *)f->ptr)->ssl))
+ return 0;
return (1);
}