You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
44 lines
1.4 KiB
44 lines
1.4 KiB
4 weeks ago
|
From 664d748a934bbb7ff295b4cf0dd3557b316d9c35 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lubomir Rintel <lkundrak@v3.sk>
|
||
|
|
Date: Thu, 23 May 2024 14:45:22 +0200
|
||
|
|
Subject: [PATCH] ublox/helpers: fix propagation of +URAT response parse error
|
||
|
|
|
||
|
|
The fallback error handling branch happens much too late, just leaking the
|
||
|
|
newly made GError instead of propagating.
|
||
|
|
---
|
||
|
|
src/plugins/ublox/mm-modem-helpers-ublox.c | 12 ++++++------
|
||
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/plugins/ublox/mm-modem-helpers-ublox.c b/src/plugins/ublox/mm-modem-helpers-ublox.c
|
||
|
|
index 0fd1c5b0b..a494dd027 100644
|
||
|
|
--- a/src/plugins/ublox/mm-modem-helpers-ublox.c
|
||
|
|
+++ b/src/plugins/ublox/mm-modem-helpers-ublox.c
|
||
|
|
@@ -1812,18 +1812,18 @@ mm_ublox_parse_urat_read_response (const gchar *response,
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
+ if (!inner_error && allowed == MM_MODEM_MODE_NONE) {
|
||
|
|
+ inner_error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
|
||
|
|
+ "Couldn't parse +URAT response: %s", response);
|
||
|
|
+ goto out;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
out:
|
||
|
|
if (inner_error) {
|
||
|
|
g_propagate_error (error, inner_error);
|
||
|
|
return FALSE;
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (allowed == MM_MODEM_MODE_NONE) {
|
||
|
|
- inner_error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_FAILED,
|
||
|
|
- "Couldn't parse +URAT response: %s", response);
|
||
|
|
- return FALSE;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
*out_allowed = allowed;
|
||
|
|
*out_preferred = preferred;
|
||
|
|
return TRUE;
|
||
|
|
--
|
||
|
|
2.45.2
|
||
|
|
|