Merge pull request libgit2#3760 from backhub/bug/openssl_read

Edward Thomson · Edward Thomson · commit 1e7fa834b523 · 2016-04-28T22:32:20.000-04:00
Fix return value of openssl_read (infinite loop)
diff --git 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,7 @@ ssize_t openssl_read(git_stream stream, void data, size_t len)`
`523`	`523`	`int ret;`
`524`	`524`
`525`	`525`	`if ((ret = SSL_read(st->ssl, data, len)) <= 0)`
`526`		`- ssl_set_error(st->ssl, ret);`
	`526`	`+ return ssl_set_error(st->ssl, ret);`
`527`	`527`
`528`	`528`	`return ret;`
`529`	`529`	`}`