Skip to content

Drop for PySSLSocket #6791

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
youknowone merged 1 commit into from
Jan 19, 2026
Merged

Drop for PySSLSocket #6791

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
24 changes: 21 additions & 3 deletions crates/stdlib/src/ssl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3503,9 +3503,9 @@ mod _ssl {
}

// Check if connection has been shut down
// After unwrap()/shutdown(), read operations should fail with SSLError
// Only block after shutdown is COMPLETED, not during shutdown process
let shutdown_state = *self.shutdown_state.lock();
if shutdown_state != ShutdownState::NotStarted {
if shutdown_state == ShutdownState::Completed {
return Err(vm
.new_os_subtype_error(
PySSLError::class(&vm.ctx).to_owned(),
Expand Down Expand Up @@ -3677,7 +3677,8 @@ mod _ssl {
}

// Check shutdown state
if *self.shutdown_state.lock() != ShutdownState::NotStarted {
// Only block after shutdown is COMPLETED, not during shutdown process
if *self.shutdown_state.lock() == ShutdownState::Completed {
return Err(vm
.new_os_subtype_error(
PySSLError::class(&vm.ctx).to_owned(),
Expand Down Expand Up @@ -4138,6 +4139,8 @@ mod _ssl {
}
}

// Set shutdown_state first to ensure atomic visibility
// This prevents read/write race conditions during shutdown
*self.shutdown_state.lock() = ShutdownState::Completed;
*self.connection.lock() = None;
return Ok(self.sock.clone());
Expand Down Expand Up @@ -4399,6 +4402,21 @@ mod _ssl {
}
}

// Clean up SSL socket resources on drop
impl Drop for PySSLSocket {
fn drop(&mut self) {
// Clear connection state
let _ = self.connection.lock().take();

// Clear pending buffers
self.pending_tls_output.lock().clear();
*self.write_buffered_len.lock() = 0;

// Reset shutdown state
*self.shutdown_state.lock() = ShutdownState::NotStarted;
}
}

// MemoryBIO - provides in-memory buffer for SSL/TLS I/O
#[pyattr]
#[pyclass(name = "MemoryBIO", module = "ssl")]
Expand Down
Loading