Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Avoid possible crash when getting server properties. #162

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

Avoid possible crash when getting server properties. #162

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f42893
Fix typo in error message.
rtiemann May 17, 2019
3f62e9f
Avoid possible crash when getting server properties.
rtiemann May 17, 2019
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
7 changes: 3 additions & 4 deletions libdleyna/server/device.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2256,15 +2256,14 @@ static void prv_system_update_id_for_props_cb(GUPnPServiceProxy *proxy,
DLS_SYSTEM_UPDATE_VAR,
g_variant_new_uint32(id));

cb_data->task.result = g_variant_ref_sink(g_variant_builder_end(
cb_task_data->vb));

on_complete:

if (!cb_data->error)
prv_get_sr_token_for_props(proxy, cb_data->task.target.device,
cb_data);
else {
cb_data->task.result = g_variant_ref_sink(g_variant_builder_end(
cb_task_data->vb));
(void) g_idle_add(dls_async_task_complete, cb_data);
g_cancellable_disconnect(cb_data->cancellable,
cb_data->cancel_id);
Expand Down Expand Up @@ -2688,7 +2687,7 @@ static void prv_sleeping_for_prop_cb(GUPnPServiceProxy *proxy,

cb_data->error = g_error_new(DLEYNA_SERVER_ERROR,
DLEYNA_ERROR_OPERATION_FAILED,
"GetNetworkInterfaceInfo failed: %s",
"GetInterfaceInfo failed: %s",
message);

goto on_complete;
Expand Down