chiark / gitweb /
fix name compare bug name_list_key_add()
authorAlan Jenkins <alan-jenkins@tuffmail.co.uk>
Mon, 8 Sep 2008 19:51:30 +0000 (21:51 +0200)
committerKay Sievers <kay.sievers@vrfy.org>
Mon, 8 Sep 2008 19:51:30 +0000 (21:51 +0200)
The search for an existing key e.g. FOO would match longer
keys e.g. FOOBAR. Reuse the correct code from name_list_remove().

udev/udev_utils.c

index 1649b8c..2df8fab 100644 (file)
@@ -89,14 +89,17 @@ struct name_entry *name_list_key_add(struct udev *udev, struct list_head *name_l
 {
        struct name_entry *name_loop;
        struct name_entry *name_new;
+       size_t keylen = strlen(key);
 
        list_for_each_entry(name_loop, name_list, node) {
-               if (strncmp(name_loop->name, key, strlen(key)) == 0) {
-                       dbg(udev, "key already present '%s', replace it\n", name_loop->name);
-                       snprintf(name_loop->name, sizeof(name_loop->name), "%s=%s", key, value);
-                       name_loop->name[sizeof(name_loop->name)-1] = '\0';
-                       return name_loop;
-               }
+               if (strncmp(name_loop->name, key, keylen) != 0)
+                       continue;
+               if (name_loop->name[keylen] != '=')
+                       continue;
+               dbg(udev, "key already present '%s', replace it\n", name_loop->name);
+               snprintf(name_loop->name, sizeof(name_loop->name), "%s=%s", key, value);
+               name_loop->name[sizeof(name_loop->name)-1] = '\0';
+               return name_loop;
        }
 
        name_new = malloc(sizeof(struct name_entry));