Skip to content

Commit e0905c3

Browse files
committed
gh-162091: Stop logging config listener on premature EOF
1 parent 7c59816 commit e0905c3

3 files changed

Lines changed: 16 additions & 1 deletion

File tree

‎Lib/logging/config.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -972,7 +972,10 @@ def handle(self):
972972
slen = struct.unpack(">L", chunk)[0]
973973
chunk = self.connection.recv(slen)
974974
while len(chunk) < slen:
975-
chunk = chunk + conn.recv(slen - len(chunk))
975+
data = conn.recv(slen - len(chunk))
976+
if not data:
977+
return
978+
chunk = chunk + data
976979
if self.server.verify is not None:
977980
chunk = self.server.verify(chunk)
978981
if chunk is not None: # verified, can process

‎Lib/test/test_logging.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3839,6 +3839,16 @@ def verify_reverse(stuff):
38393839
('ERROR', '2'),
38403840
], pat=r"^[\w.]+ -> (\w+): (\d+)$")
38413841

3842+
def test_listen_disconnect(self):
3843+
listener = logging.config.listen(0)
3844+
handler = listener.hdlr.__new__(listener.hdlr)
3845+
handler.connection = Mock(recv=Mock(side_effect=(
3846+
struct.pack('>L', 100), b'abc', b'')))
3847+
3848+
handler.handle()
3849+
3850+
self.assertEqual(handler.connection.recv.call_count, 3)
3851+
38423852
@support.requires_working_socket()
38433853
def test_listen_server_error(self):
38443854
# The "ready" event should be set even if the server fails to start.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix an infinite loop in :func:`logging.config.listen` when a client
2+
disconnects before sending the complete configuration payload.

0 commit comments

Comments
 (0)