From 0365f9f0d8d8837b36e2f3f44d3ec1750244bb24 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sun, 7 Jul 2024 22:37:22 +0200 Subject: Revert "ublox/helpers: fix propagation of +URAT response parse error" Not quite correct -- with the patch applied, the newly allocated GError could potentially overwrite inner_error that was set previously. This reverts commit d550a24ffdae4492e9f9e18fdf294adcda28fb65. --- src/plugins/ublox/mm-modem-helpers-ublox.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/plugins/ublox/mm-modem-helpers-ublox.c b/src/plugins/ublox/mm-modem-helpers-ublox.c index ffb1374d..0fd1c5b0 100644 --- a/src/plugins/ublox/mm-modem-helpers-ublox.c +++ b/src/plugins/ublox/mm-modem-helpers-ublox.c @@ -1813,13 +1813,14 @@ mm_ublox_parse_urat_read_response (const gchar *response, } 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); - } - - if (inner_error) { - g_propagate_error (error, inner_error); return FALSE; } -- cgit v1.2.3-70-g09d2