From ac8cc08f41b34864d3f10c7fce453e4540b5d7c9 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Fri, 10 Aug 2012 11:51:02 +0200 Subject: [PATCH] terminal: check for errors when initializing text renderer We need to check for errors, otherwise, the text-renderer may be invalid and we will never be able to render on it. Signed-off-by: David Herrmann --- src/terminal.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/terminal.c b/src/terminal.c index 6cf509c..8da7925 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -191,7 +191,11 @@ static int add_display(struct kmscon_terminal *term, struct uterm_display *disp) goto err_font; } - kmscon_text_set(scr->txt, scr->font, scr->screen); + ret = kmscon_text_set(scr->txt, scr->font, scr->screen); + if (ret) { + log_error("cannot set text-renderer parameters"); + goto err_text; + } cols = kmscon_text_get_cols(scr->txt); rows = kmscon_text_get_rows(scr->txt); @@ -204,6 +208,8 @@ static int add_display(struct kmscon_terminal *term, struct uterm_display *disp) uterm_display_ref(scr->disp); return 0; +err_text: + kmscon_text_unref(scr->txt); err_font: kmscon_font_unref(scr->font); err_screen: