From: Jonas Bonn <[email protected]>
Move initialization of 'dcs' ahead of 'content' fetch to prevent using
uninitialized 'dcs' in ofono_ussd_notify.
---
drivers/atmodem/ussd.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/atmodem/ussd.c b/drivers/atmodem/ussd.c
index f1907a00..8416bec6 100644
--- a/drivers/atmodem/ussd.c
+++ b/drivers/atmodem/ussd.c
@@ -117,12 +117,12 @@ static void cusd_parse(GAtResult *result, struct
ofono_ussd *ussd)
if (!g_at_result_iter_next_number(&iter, &status))
return;
- if (!g_at_result_iter_next_string(&iter, &content))
- goto out;
-
if (!g_at_result_iter_next_number(&iter, &dcs))
dcs = 0;
+ if (!g_at_result_iter_next_string(&iter, &content))
+ goto out;
+
if (!cbs_dcs_decode(dcs, NULL, NULL, &charset, NULL, NULL, NULL)) {
ofono_error("Unsupported USSD data coding scheme (%02x)", dcs);
status = 4; /* Not supported */
--
2.17.1
_______________________________________________
ofono mailing list
[email protected]
https://lists.ofono.org/mailman/listinfo/ofono
