SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge request !1479 from 'modemmanager-coredump3'

Browse Source 
qmi-shared: fix crash when passing a wrong log object

https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/merge_requests/1479
This commit is contained in:
Dan Williams
2026-08-30 10:16:27 -05:00
parent c920ea6592 efe507c240
commit 5e91dd20c0
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mm-shared-qmi.c
+9 -8
View File
@@ -6601,21 +6601,22 @@ loc_unlock_location_engine_ready (QmiClientLoc *client,
QmiMessageLocSetEngineLockOutput *output; QmiMessageLocSetEngineLockOutput *output;
GError *error = NULL; GError *error = NULL;
self = g_task_get_source_object (task);
output = qmi_client_loc_set_engine_lock_finish (client, res, &error); output = qmi_client_loc_set_engine_lock_finish (client, res, &error);
if (!output) { if (!output) {
mm_obj_warn (client, "QMI operation failed: %s", error->message); mm_obj_warn (self, "QMI operation failed: %s", error->message);
g_error_free (error); g_error_free (error);
} }
if (!qmi_message_loc_set_engine_lock_output_get_result (output, &error) if (!qmi_message_loc_set_engine_lock_output_get_result (output, &error)
&& !g_error_matches (error, QMI_PROTOCOL_ERROR, QMI_PROTOCOL_ERROR_NO_PERMISSION)) { && !g_error_matches (error, QMI_PROTOCOL_ERROR, QMI_PROTOCOL_ERROR_NO_PERMISSION)) {
mm_obj_warn (client, "Couldn't unlock GPS engine: %s", error->message); mm_obj_warn (self, "Couldn't unlock GPS engine: %s", error->message);
g_error_free (error); g_error_free (error);
} }
qmi_message_loc_set_engine_lock_output_unref (output); qmi_message_loc_set_engine_lock_output_unref (output);
self = g_task_get_source_object (task);
location_load_capabilities (self, task); location_load_capabilities (self, task);
} }
@@ -7050,20 +7051,20 @@ loc_register_event_inject_req_ready (QmiClientLoc *client,
MMSharedQmi *self; MMSharedQmi *self;
Private *priv; Private *priv;
self = g_task_get_source_object (task);
priv = get_private (self);
output = qmi_client_loc_register_events_finish (client, res, &error); output = qmi_client_loc_register_events_finish (client, res, &error);
if (!output) { if (!output) {
mm_obj_warn (client, "QMI operation failed: %s", error->message); mm_obj_warn (self, "QMI operation failed: %s", error->message);
goto out; goto out;
} }
if (!qmi_message_loc_register_events_output_get_result (output, &error)) { if (!qmi_message_loc_register_events_output_get_result (output, &error)) {
mm_obj_warn (client, "Couldn't not register tracking events: %s", error->message); mm_obj_warn (self, "Couldn't not register tracking events: %s", error->message);
goto out; goto out;
} }
self = g_task_get_source_object (task);
priv = get_private (self);
g_assert (!priv->loc_assistance_inject_time_req_indication_id); g_assert (!priv->loc_assistance_inject_time_req_indication_id);
priv->loc_assistance_inject_time_req_indication_id = priv->loc_assistance_inject_time_req_indication_id =
g_signal_connect (client, g_signal_connect (client,