Skip to content

ssl: clear error queue before raising SystemCallError #1115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhenium merged 1 commit into from
Sep 24, 2026
+31 −26
Merged

ssl: clear error queue before raising SystemCallError #1115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 30 additions & 26 deletions ext/openssl/ossl_ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1874,13 +1874,15 @@ ossl_start_ssl(VALUE self, int (*func)(SSL *), const char *funcname, VALUE opts)
io_wait_readable(io);
continue;
case SSL_ERROR_SYSCALL:
if (saved_errno) {
ossl_clear_error();
#ifdef __APPLE__
/* See ossl_ssl_write_internal() */
if (saved_errno == EPROTOTYPE)
continue;
/* See ossl_ssl_write_internal() */
if (saved_errno == EPROTOTYPE)
continue;
#endif
if (saved_errno)
rb_exc_raise(rb_syserr_new(saved_errno, funcname));
}
/* fallthrough */
default: {
VALUE error_append = Qnil;
Expand Down Expand Up @@ -2078,20 +2080,20 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
io_wait_readable(io);
break;
case SSL_ERROR_SYSCALL:
if (saved_errno) {
ossl_clear_error();
rb_exc_raise(rb_syserr_new(saved_errno, "SSL_read"));
}
if (!ERR_peek_error()) {
if (saved_errno)
rb_exc_raise(rb_syserr_new(saved_errno, "SSL_read"));
else {
/*
* The underlying BIO returned 0. This is actually a
* protocol error. But unfortunately, not all
* implementations cleanly shutdown the TLS connection
* but just shutdown/close the TCP connection. So report
* EOF for now...
*/
if (no_exception_p(opts)) { return Qnil; }
rb_eof_error();
}
/*
* The underlying BIO returned 0. This is actually a
* protocol error. But unfortunately, not all
* implementations cleanly shutdown the TLS connection
* but just shutdown/close the TCP connection. So report
* EOF for now...
*/
if (no_exception_p(opts)) { return Qnil; }
rb_eof_error();
}
/* fall through */
default:
Expand Down Expand Up @@ -2188,18 +2190,20 @@ ossl_ssl_write_internal_safe(VALUE _args)
io_wait_readable(io);
continue;
case SSL_ERROR_SYSCALL:
if (saved_errno) {
ossl_clear_error();
#ifdef __APPLE__
/*
* It appears that send syscall can return EPROTOTYPE if the
* socket is being torn down. Retry to get a proper errno to
* make the error handling in line with the socket library.
* [Bug #14713] https://bugs.ruby-lang.org/issues/14713
*/
if (saved_errno == EPROTOTYPE)
continue;
/*
* It appears that send syscall can return EPROTOTYPE if the
* socket is being torn down. Retry to get a proper errno to
* make the error handling in line with the socket library.
* [Bug #14713] https://bugs.ruby-lang.org/issues/14713
*/
if (saved_errno == EPROTOTYPE)
continue;
#endif
if (saved_errno)
rb_exc_raise(rb_syserr_new(saved_errno, "SSL_write"));
}
/* fallthrough */
default:
ossl_raise(eSSLError, "SSL_write");
Expand Down
1 change: 1 addition & 0 deletions test/openssl/test_ssl.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,6 +1255,7 @@ def test_connect_systemcallerror
assert_raise(Errno::ECONNRESET, Errno::EPIPE) {
ssl.connect
}
assert_empty(OpenSSL.errors)
ensure
sock&.close
end
Expand Down
Loading