From 2cf31bfef0262014111b1a7ac53fbb145c6b79ad Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 15 Apr 2020 22:37:10 +0200 Subject: [PATCH] keyfile: minor cleanup handling error in read_array_of_uint() Why "if (length > G_MAXUINT)"? This is never going to hit. Also, we probably should actual missing keys handle differently from empty lists. If @error is set, return without setting the property. --- shared/nm-keyfile/nm-keyfile.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/shared/nm-keyfile/nm-keyfile.c b/shared/nm-keyfile/nm-keyfile.c index 9a317bfc13..879b1b004f 100644 --- a/shared/nm-keyfile/nm-keyfile.c +++ b/shared/nm-keyfile/nm-keyfile.c @@ -167,9 +167,10 @@ read_array_of_uint (GKeyFile *file, gsize length; gsize i; gs_free int *tmp = NULL; + gs_free_error GError *error = NULL; - tmp = nm_keyfile_plugin_kf_get_integer_list (file, nm_setting_get_name (setting), key, &length, NULL); - if (length > G_MAXUINT) + tmp = nm_keyfile_plugin_kf_get_integer_list (file, nm_setting_get_name (setting), key, &length, &error); + if (error) return; array = g_array_sized_new (FALSE, FALSE, sizeof (guint), length);