From 1e5a1d034152bfa418db310ab6b9cdf8bc0403f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Fri, 30 Oct 2020 16:25:55 +0100 Subject: [PATCH] particle/map: return NULL if we neither find a matching tag, nor have a default tag --- particles/map.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/particles/map.c b/particles/map.c index 2f5c460..6a65a72 100644 --- a/particles/map.c +++ b/particles/map.c @@ -87,11 +87,13 @@ instantiate(const struct particle *particle, const struct tag_set *tags) { const struct private *p = particle->private; const struct tag *tag = tag_for_name(tags, p->tag); - assert(tag != NULL || p->default_particle != NULL); - - if (tag == NULL) - return p->default_particle->instantiate(p->default_particle, tags); + if (tag == NULL) { + if (p->default_particle != NULL) + return p->default_particle->instantiate(p->default_particle, tags); + else + return NULL; + } const char *tag_value = tag->as_string(tag); struct particle *pp = NULL;