device_id: fix memleak and free idname

Remove extra code path used only for 'free()'
and free(idname) on all paths that do not add it to list
and avoid memleak in few cases.

diff --git a/lib/device/device_id.c b/lib/device/device_id.c
index cf5867dabcb8e01dd7fcdd75e2b62dc7beaebd03..1a9705f0430ac7c1f809b6bc4fe38c838ea0285a 100644 (file)
--- a/lib/device/device_id.c
+++ b/lib/device/device_id.c
@@ -1008,21 +1008,24 @@ id_done:
                        break;
                }
        }
-       if (found_id && !strcmp(id->idname, idname)) {
-               free((char *)idname);
-       } else if (found_id && strcmp(id->idname, idname)) {
+
+       if (found_id && idname && strcmp(id->idname, idname)) {
                dm_list_del(&id->list);
                free_did(id);
                found_id = 0;
        }
        if (!found_id) {
-               if (!(id = zalloc(sizeof(struct dev_id))))
+               if (!(id = zalloc(sizeof(struct dev_id)))) {
+                       free((char *)idname);
                        return_0;
+               }
                id->idtype = idtype;
                id->idname = (char *)idname;
                id->dev = dev;
                dm_list_add(&dev->ids, &id->list);
-       }
+       } else
+               free((char*)idname);
+
        dev->id = id;
        dev->flags |= DEV_MATCHED_USE_ID;