summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2009-07-10 07:25:50 +0200
committerClemens Ladisch <clemens@ladisch.de>2009-07-10 07:25:50 +0200
commite2317969e140b2c956db38583dcc0d7f3747670f (patch)
tree9649c55b260c5ddfa6591fe3e8d736e6b8b8a138 /src
parent2c4b3c7d091b5e7d5202a50e7623971e47221775 (diff)
downloadalsa-lib-e2317969e140b2c956db38583dcc0d7f3747670f.tar.gz
conf.c: snd_config_set_id: prevent duplicate ids
snd_config_add() checks for duplicate ids, but it was possible to create duplicates by adding a note and changing the id afterwards with snd_config_set_id(); so we have to add a check there, too. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'src')
-rw-r--r--src/conf.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/conf.c b/src/conf.c
index ff9d4332..d1fa1097 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1521,9 +1521,17 @@ int snd_config_get_id(const snd_config_t *config, const char **id)
*/
int snd_config_set_id(snd_config_t *config, const char *id)
{
+ snd_config_iterator_t i, next;
char *new_id;
assert(config);
if (id) {
+ if (config->father) {
+ snd_config_for_each(i, next, config->father) {
+ snd_config_t *n = snd_config_iterator_entry(i);
+ if (n != config && strcmp(id, n->id) == 0)
+ return -EEXIST;
+ }
+ }
new_id = strdup(id);
if (!new_id)
return -ENOMEM;