summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@github.com>2016-04-28 22:32:20 -0400
committerEdward Thomson <ethomson@github.com>2016-04-28 22:32:20 -0400
commit1e7fa834b5232612693cd0c3e9d7a075392028d7 (patch)
treea931b63ec060eecca90d28078dd6278291bab806
parent88284dfb7905c5990babb4238b7cd30bdf823500 (diff)
parent568c5a9fc111dbbee05c0bc890eca21880826faa (diff)
downloadlibgit2-1e7fa834b5232612693cd0c3e9d7a075392028d7.tar.gz
Merge pull request #3760 from backhub/bug/openssl_read
Fix return value of openssl_read (infinite loop)
-rw-r--r--src/openssl_stream.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/openssl_stream.c b/src/openssl_stream.c
index edea8fef7..b8ab21fef 100644
--- a/src/openssl_stream.c
+++ b/src/openssl_stream.c
@@ -523,7 +523,7 @@ ssize_t openssl_read(git_stream *stream, void *data, size_t len)
int ret;
if ((ret = SSL_read(st->ssl, data, len)) <= 0)
- ssl_set_error(st->ssl, ret);
+ return ssl_set_error(st->ssl, ret);
return ret;
}