sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-30 03:56:02 +08:00
Code Activity

Fix: File descriptor leak in nested CaptureNemuIpc call

Browse Source
This commit is contained in:
LmeSzinc
2024-04-08 21:56:23 +08:00
parent 65c826a70f
commit 6bae27cacc
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
module/device/method/nemu_ipc.py
View File

@@ -40,13 +40,6 @@ class CaptureStd:
""" """
def __init__(self): def __init__(self):
self.fdout = sys.stdout.fileno()
self.fderr = sys.stderr.fileno()
self.reader_out, self.writer_out = os.pipe()
self.reader_err, self.writer_err = os.pipe()
self.old_stdout = os.fdopen(os.dup(self.fdout), 'w')
self.old_stderr = os.fdopen(os.dup(self.fderr), 'w')
self.stdout = b'' self.stdout = b''
self.stderr = b'' self.stderr = b''
@@ -61,19 +54,24 @@ class CaptureStd:
sys.stderr = os.fdopen(self.fderr, 'w') sys.stderr = os.fdopen(self.fderr, 'w')
def __enter__(self): def __enter__(self):
self.old_stdout.__enter__() self.fdout = sys.stdout.fileno()
self.old_stderr.__enter__() self.fderr = sys.stderr.fileno()
with open(self.writer_out, 'w') as file: self.reader_out, self.writer_out = os.pipe()
self._redirect_stdout(to=file) self.reader_err, self.writer_err = os.pipe()
with open(self.writer_err, 'w') as file: self.old_stdout = os.fdopen(os.dup(self.fdout), 'w')
self._redirect_stderr(to=file) self.old_stderr = os.fdopen(os.dup(self.fderr), 'w')
file_out = os.fdopen(self.writer_out, 'w')
file_err = os.fdopen(self.writer_err, 'w')
self._redirect_stdout(to=file_out)
self._redirect_stderr(to=file_err)
return self return self
def __exit__(self, exc_type, exc_val, exc_tb): def __exit__(self, exc_type, exc_val, exc_tb):
self._redirect_stdout(to=self.old_stdout) self._redirect_stdout(to=self.old_stdout)
self._redirect_stderr(to=self.old_stderr) self._redirect_stderr(to=self.old_stderr)
self.old_stdout.__exit__(exc_type, exc_val, exc_tb) self.old_stdout.close()
self.old_stderr.__exit__(exc_type, exc_val, exc_tb) self.old_stderr.close()
self.stdout = self.recvall(self.reader_out) self.stdout = self.recvall(self.reader_out)
self.stderr = self.recvall(self.reader_err) self.stderr = self.recvall(self.reader_err)