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

iface-modem-simple: ignore ps wait state result, only check error

Browse Source 
As we do in the similar modem state wait operations in the modem
interface, the caller of the wait operation may ignore the state
result as it's really not required in this case. Only looking at
whether an error is set or not is enough.

This by itself fixes a crash where
mm_iface_modem_3gpp_wait_for_packet_service_state_finish() may have
returned UNKNOWN without error set.

  0x000079616c2564ed (libglib-2.0.so.0 - gtestutils.c: 3256)      g_assertion_message
  0x000079616c25654b (libglib-2.0.so.0 - gtestutils.c: 3282)      g_assertion_message_expr
  0x000057ba46231150 (ModemManager - mm-iface-modem-simple.c: 344)        packet_service_attach_in_3gpp_network_step
  0x000079616c0efb02 (libgio-2.0.so.0 - gtask.c: 1232)    g_task_return_now
  0x000079616c0eeb54 (libgio-2.0.so.0 - gtask.c: 1301)    g_task_return
  0x000057ba4620e5bd (ModemManager - mm-iface-modem-3gpp.c: 189)  wait_for_packet_service_state_context_complete
  0x000057ba4620b441 (ModemManager - mm-iface-modem-3gpp.c: 261)  packet_service_state_changed
This commit is contained in:
Aleksander Morgado
2023-09-04 17:32:35 +00:00
committed by Aleksander Morgado
parent 47239b8499
commit 36dc193b40
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/mm-iface-modem-simple.c
View File

@@ -303,7 +303,8 @@ wait_for_packet_service_state_ready (MMIfaceModem3gpp *self,
ctx = g_task_get_task_data (task);
g_assert (!ctx->error);
if (!mm_iface_modem_3gpp_wait_for_packet_service_state_finish (self, res, &ctx->error))
mm_iface_modem_3gpp_wait_for_packet_service_state_finish (self, res, &ctx->error);
if (ctx->error)
ctx->step++;
else
ctx->step = PACKET_SERVICE_ATTACH_IN_3GPP_NETWORK_STEP_LAST;