diff options
| author | Aleksander Morgado <aleksandermj@chromium.org> | 2023-09-04 17:32:35 +0000 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2023-09-11 19:39:59 +0000 |
| commit | 36dc193b409b3393f4ccd9938667b35105f68abd (patch) | |
| tree | 320c9afaf3d1568df68f7839e887a7bcc05e8f77 | |
| parent | 47239b8499a12a37435ae41c286ec074a658ff2a (diff) | |
iface-modem-simple: ignore ps wait state result, only check error
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
| -rw-r--r-- | src/mm-iface-modem-simple.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mm-iface-modem-simple.c b/src/mm-iface-modem-simple.c index 56d9cff4..2427773c 100644 --- a/src/mm-iface-modem-simple.c +++ b/src/mm-iface-modem-simple.c @@ -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; |