Skip to content

Fix memory leak from recursive print warning flood in hs.ipc #3845

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
dmgerman wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −1
Open

Fix memory leak from recursive print warning flood in hs.ipc #3845

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
14 changes: 13 additions & 1 deletion extensions/ipc/ipc.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ local MSG_ID = {
-- otherwise we'll have to deal with a potential race condition
module.insidePrintInstances = {}

-- Track instances that have already been warned about recursion
-- to avoid flooding the console with warnings (warn once per instance)
module.warnedRecursionInstances = {}

module.print_enter = function(instance)
val = module.insidePrintInstances[instance] or 0
module.insidePrintInstances[instance] = val + 1
Expand Down Expand Up @@ -68,7 +72,12 @@ local printReplacement = function(...)
for id,v in pairs(module.__registeredCLIInstances) do
if v._cli.console and v.print and not v._cli.quietMode then
if module.print_inside(id) then
log.w(string.format("Instance of [%s] already recursing, refusing request.", id))
-- Only warn once per instance to avoid flooding console/memory
if not module.warnedRecursionInstances[id] then
module.warnedRecursionInstances[id] = true
-- Use originalPrint to avoid triggering more recursion via log.w
originalPrint(string.format("[hs.ipc] Instance %s: recursion detected, future warnings suppressed", id))
end
else
module.print_enter(id)
-- v.print(...)
Expand Down Expand Up @@ -421,6 +430,9 @@ module.__defaultHandler = function(_, msgID, msg)
log.df("unregistering %s", msg)
module.__registeredCLIInstances[msg]._cli.remote:delete()
module.__registeredCLIInstances[msg] = nil
-- Clean up recursion warning tracking for this instance
module.warnedRecursionInstances[msg] = nil
module.insidePrintInstances[msg] = nil
elseif msgID == MSG_ID.COMMAND or msgID == MSG_ID.QUERY then
local instanceID, code = msg:match("^([%w-]*)\0(.*)$")
-- print(msg, instanceID, code)
Expand Down
Loading