From a789230cf9f87c68fcced647d0a1e8edc516f1c2 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 16 Oct 2019 21:52:12 +0200 Subject: font: font_from_name() returns an allocated font struct --- font.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'font.c') diff --git a/font.c b/font.c index 049a3be8..b68e341c 100644 --- a/font.c +++ b/font.c @@ -291,8 +291,8 @@ from_name(const char *base_name, const font_list_t *fallbacks, const char *attri return true; } -bool -font_from_name(font_list_t names, const char *attributes, struct font *font) +struct font * +font_from_name(font_list_t names, const char *attributes) { if (tll_length(names) == 0) return false; @@ -308,10 +308,14 @@ font_from_name(font_list_t names, const char *attributes, struct font *font) tll_push_back(fallbacks, it->item); } + struct font *font = malloc(sizeof(*font)); bool ret = from_name(tll_front(names), &fallbacks, attributes, font, false); + if (!ret) + free(font); + tll_free(fallbacks); - return ret; + return ret ? font : NULL; } static size_t -- cgit v1.3