about summary refs log tree commit diff
path: root/src/core/settings/plugins/keyfile
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2021-08-16 09:52:58 +0200
committerMichael Biebl <biebl@debian.org>2021-08-16 09:52:58 +0200
commit4e636b195bda344f34514ebb1a855f99b004164b (patch)
tree8992a936f0a115aa3c60fe5cf8845085aab31f08 /src/core/settings/plugins/keyfile
parentfac255a528d295b515fdb7867aac5cab8c6f823f (diff)
parentbfe522304da217296e2a61040f58e35ec5d6f3f2 (diff)
Update upstream source from tag 'upstream/1.30.6'
Update to upstream version '1.30.6'
with Debian dir b4583b68cbcf2c2cc2b9687a460901d0ed5f7e42
Diffstat (limited to 'src/core/settings/plugins/keyfile')
-rw-r--r--src/core/settings/plugins/keyfile/nms-keyfile-utils.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-utils.c b/src/core/settings/plugins/keyfile/nms-keyfile-utils.c
index f3dffdae..ca1233f5 100644
--- a/src/core/settings/plugins/keyfile/nms-keyfile-utils.c
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-utils.c
@@ -137,7 +137,11 @@ nms_keyfile_nmmeta_read(const char * dirname,
                                        NMMETA_KF_GROUP_NAME_NMMETA,
                                        NMMETA_KF_KEY_NAME_NMMETA_UUID,
                                        NULL);
-        if (!nm_streq0(v_uuid, uuid))
+        if (!v_uuid)
+            return FALSE;
+        if (strncmp(v_uuid, uuid, uuid_len) != 0)
+            return FALSE;
+        if (v_uuid[uuid_len] != '\0')
             return FALSE;
 
         loaded_path      = g_key_file_get_string(kf,