[3.5] bpo-30594: Fixed refcounting in newPySSLSocket (GH-1992) (#1993) · python-emscripten/cpython@54ba41e · GitHub

1. python-emscripten
2. cpython

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit 54ba41e

Browse filesBrowse the repository at this point in the historyBrowse files

njsmith

authored and

serhiy-storchaka

committed

[3.5] bpo-30594: Fixed refcounting in newPySSLSocket (pythonGH-1992) (python#1993)

If pass a server_hostname= that fails IDNA decoding to SSLContext.wrap_socket or SSLContext.wrap_bio, then the SSLContext object had a spurious Py_DECREF called on it, eventually leading to segfaults. (cherry picked from commit 65ece7c)

1 parent e3a0ce2 commit 54ba41e
Copy full SHA for 54ba41e

1 file changed

+1-2Lines changed: 1 addition & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Modules
  • _ssl.c

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Modules/_ssl.c‎

Copy file name to clipboardExpand all lines: Modules/_ssl.c

+1-2Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -570,6 +570,7 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
570	570	self->ssl = NULL;
571	571	self->Socket = NULL;
572	572	self->ctx = sslctx;
	573	+ Py_INCREF(sslctx);
573	574	self->shutdown_seen_zero = 0;
574	575	self->handshake_done = 0;
575	576	self->owner = NULL;
@@ -584,8 +585,6 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
584	585	self->server_hostname = hostname;
585	586	}
586	587
587		- Py_INCREF(sslctx);
588		-
589	588	/* Make sure the SSL error state is initialized */
590	589	(void) ERR_get_state();
591	590	ERR_clear_error();

0 commit comments

Comments

0 (0)