shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-26 14:04:03 +03:00
Code

fix name compare bug name_list_key_add()

Browse Source 
The search for an existing key e.g. FOO would match longer
keys e.g. FOOBAR. Reuse the correct code from name_list_remove().
This commit is contained in:
Alan Jenkins 2008-09-08 21:51:30 +02:00 committed by Kay Sievers
parent 37a123a9bc
commit cb8896cd74
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
udev/udev_utils.c
View 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));