From c54ab7df88ee7c00c8e6e1703303db0b1e0b6a19 Mon Sep 17 00:00:00 2001 From: Marco Peereboom Date: Mon, 18 Jul 2011 16:32:45 +0000 Subject: Fix a logic bug in add_mime_type() that could result in a NULL pointer dereference in case of invalid parameters. From: Fabian Keil --- xxxterm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xxxterm.c b/xxxterm.c index cc4d1b5..b33ee11 100644 --- a/xxxterm.c +++ b/xxxterm.c @@ -1591,7 +1591,7 @@ add_mime_type(struct settings *s, char *line) /* XXX this could be smarter */ - if (line == NULL && strlen(line) == 0) { + if (line == NULL || strlen(line) == 0) { show_oops(NULL, "add_mime_type invalid parameters"); return (1); } -- cgit 1.4.1-2-gfad0