From ec1d815db50de27f5f717cfc5880df33258bbf58 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sat, 9 Apr 2016 21:43:32 +0200 Subject: [PATCH] bouquet: don't crash tvh when duplicate files with identical source files are loaded, fixes #3708 --- src/bouquet.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/bouquet.c b/src/bouquet.c index eb66498bc..ae18adc00 100644 --- a/src/bouquet.c +++ b/src/bouquet.c @@ -111,7 +111,11 @@ bouquet_create(const char *uuid, htsmsg_t *conf, } bq2 = RB_INSERT_SORTED(&bouquets, bq, bq_link, _bq_cmp); - assert(bq2 == NULL); + if (bq2) { + tvherror("bouquet", "found duplicate source id: '%s', remove duplicate config", bq->bq_src); + free(bq); + return NULL; + } bq->bq_saveflag = 1; @@ -1236,7 +1240,8 @@ bouquet_init(void) HTSMSG_FOREACH(f, c) { if (!(m = htsmsg_field_get_map(f))) continue; bq = bouquet_create(f->hmf_name, m, NULL, NULL); - bq->bq_saveflag = 0; + if (bq) + bq->bq_saveflag = 0; } htsmsg_destroy(c); } -- 2.47.3