Skip to content

Fix potential stack overflow in _wait_until_complete #301

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

Open
laz- wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix potential stack overflow in _wait_until_complete #301

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc4eba9
Fix potential stack overflow in _wait_until_complete
laz- Jun 2, 2026
9a03edc
Restore TODO comment on retry interval
laz- Jun 2, 2026
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
72 changes: 35 additions & 37 deletions SRT/netfunnel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,43 +97,41 @@ def _wait_until_complete(self, key: str, nwait: str) -> str:
NetFunnel이 완료될 때까지 대기합니다.
"""

params = {
"opcode": self.OP_CODE["chkEnter"],
"key": key,
"nfid": "0",
"prefix": f"NetFunnel.gRtype={self.OP_CODE['chkEnter']};",
"ttl": 1,
"sid": "service_1",
"aid": "act_10",
"js": "true",
self._get_timestamp_for_netfunnel(): "",
}

try:
resp = self.session.get(
self.NETFUNNEL_URL,
params=params,
)
except Exception as e:
raise SRTNetFunnelError(e) from e

netfunnel_resp = NetFunnelResponse.parse(resp.text)

nwait_ = netfunnel_resp.get("nwait")
key_ = netfunnel_resp.get("key")
if key_ is None:
raise SRTNetFunnelError("NetFunnel key not found in response")

if nwait_ and nwait_ != "0":
print(f"대기인원: {nwait_}명")

# 1 sec
# TODO: find how to calculate the re-try interval
time.sleep(1)

return self._wait_until_complete(key_, nwait_)
else:
return key_
while True:
params = {
"opcode": self.OP_CODE["chkEnter"],
"key": key,
"nfid": "0",
"prefix": f"NetFunnel.gRtype={self.OP_CODE['chkEnter']};",
"ttl": 1,
"sid": "service_1",
"aid": "act_10",
"js": "true",
self._get_timestamp_for_netfunnel(): "",
}

try:
resp = self.session.get(
self.NETFUNNEL_URL,
params=params,
)
Comment on lines +114 to +117

@gemini-code-assist gemini-code-assist Bot Jun 2, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Under high-traffic conditions (when NetFunnel is typically active), the server is more likely to experience high load, leading to dropped connections or extremely slow responses. Since requests.get has no default timeout, the call can hang indefinitely, causing the application to freeze. Adding an explicit timeout parameter prevents this.

Suggested change
resp = self.session.get(
self.NETFUNNEL_URL,
params=params,
)
resp = self.session.get(
self.NETFUNNEL_URL,
params=params,
timeout=10,
)

except Exception as e:
raise SRTNetFunnelError(e) from e

netfunnel_resp = NetFunnelResponse.parse(resp.text)

nwait_ = netfunnel_resp.get("nwait")
key_ = netfunnel_resp.get("key")
if key_ is None:
raise SRTNetFunnelError("NetFunnel key not found in response")

if nwait_ and nwait_ != "0":
print(f"대기인원: {nwait_}명")
# TODO: find how to calculate the re-try interval
time.sleep(1)
key = key_
else:
return key_

def _set_complete(self, key: str):
"""
Expand Down
Loading