From 657cabcfce6794d2a2f629d63dbd56fc149dab2e Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Sun, 22 Nov 2020 17:01:19 +0100 Subject: libmm-glib,common-helpers: make hexstr2bin() return a GError This util method checks whether the input string is a valid hex string, so make sure we return a GError on failure. --- src/mm-modem-helpers.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/mm-modem-helpers.c') diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c index 3ee12aaa..a2fb07fa 100644 --- a/src/mm-modem-helpers.c +++ b/src/mm-modem-helpers.c @@ -4291,10 +4291,9 @@ mm_3gpp_parse_emergency_numbers (const char *raw, GError **error) return NULL; } - bin = (guint8 *) mm_utils_hexstr2bin (raw, &binlen); + bin = (guint8 *) mm_utils_hexstr2bin (raw, &binlen, error); if (!bin) { - g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_INVALID_ARGS, - "invalid raw emergency numbers list contents: %s", raw); + g_prefix_error (error, "invalid raw emergency numbers list contents: "); return NULL; } -- cgit v1.2.3-70-g09d2