about summary refs log tree commit diff
path: root/shared/nm-glib-aux/nm-shared-utils.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2020-08-19 10:14:39 +0200
committerMichael Biebl <biebl@debian.org>2020-08-19 10:14:39 +0200
commitc61fd724fffbf1225fdd233a8e450d9a1ddcc849 (patch)
tree43e0feb9d3cf8842022ed94b164324c0603855fc /shared/nm-glib-aux/nm-shared-utils.c
parentf86436e83639986f20fb44663edcccf36c3c150c (diff)
parente7b44ef4c80907346ec7492a09c45277459924fc (diff)
Update upstream source from tag 'upstream/1.26.2'
Update to upstream version '1.26.2'
with Debian dir ba5e61f5f737f4e42f743638f9a83bd5cd708a3c
Diffstat (limited to 'shared/nm-glib-aux/nm-shared-utils.c')
-rw-r--r--shared/nm-glib-aux/nm-shared-utils.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/shared/nm-glib-aux/nm-shared-utils.c b/shared/nm-glib-aux/nm-shared-utils.c
index 681b4dd1..3d1b0098 100644
--- a/shared/nm-glib-aux/nm-shared-utils.c
+++ b/shared/nm-glib-aux/nm-shared-utils.c
@@ -4194,7 +4194,10 @@ nm_utils_hexstr2bin_alloc (const char *hexstr,
 	guint8 *buffer;
 	gsize buffer_len, len;
 
-	g_return_val_if_fail (hexstr, NULL);
+	if (G_UNLIKELY (!hexstr)) {
+		NM_SET_OUT (out_len, 0);
+		g_return_val_if_fail (hexstr, NULL);
+	}
 
 	nm_assert (required_len > 0 || out_len);