fdo-mirrors/wireplumber
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/wireplumber.git synced 2026-05-08 03:28:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

policy-node: do not hold references in link-error handler

Browse source 
Using `si` and `si_target` in the error handler results in references to
the objects getting added, keeping them alive indefinitely. Look them up
using their ids instead.

Fixes b8201d2716

Closes https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/419
This commit is contained in:
Robert Mader 2023-02-20 14:19:06 +01:00
parent e7c394d6c2
commit 979fd59329
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/scripts/policy-node.lua
View file

@ -99,20 +99,26 @@ function createLink (si, si_target, passthrough, exclusive)
end
si_link:connect("link-error", function (_, error_msg)
Log.info (si_link, "got link-error signal: " .. error_msg)
local ids = {si_id}
if si_flags[si_id] ~= nil then
table.insert (ids, si_flags[si_id].peer_id)
end
local n1 = si:get_associated_proxy ("node")
local n2 = si_target:get_associated_proxy ("node")
for _, node in ipairs ({n1, n2}) do
local client_id = node.properties["client.id"]
if client_id then
local client = clients_om:lookup {
Constraint { "bound-id", "=", client_id, type = "gobject" }
}
if client then
Log.info (node, "sending client error")
client:send_error(node["bound-id"], -32, error_msg)
for _, id in ipairs (ids) do
local si = linkables_om:lookup {
Constraint { "id", "=", id, type = "gobject" },
}
if si then
local node = si:get_associated_proxy ("node")
local client_id = node.properties["client.id"]
if client_id then
local client = clients_om:lookup {
Constraint { "bound-id", "=", client_id, type = "gobject" }
}
if client then
Log.info (node, "sending client error: " .. error_msg)
client:send_error (node["bound-id"], -32, error_msg)
end
end
end
end