From e6d7ea3b6b52a6b77154d5b508b2555c11439580 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Tue, 30 Dec 2014 13:14:31 +0000 Subject: [PATCH] Do not dereference null pointer. --- src/libmime/message.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libmime/message.c b/src/libmime/message.c index 8dafe75e1..94137af15 100644 --- a/src/libmime/message.c +++ b/src/libmime/message.c @@ -1130,7 +1130,7 @@ detect_text_language (struct mime_text_part *part) gunichar c; gint32 remain = part->content->len, max = 0, processed = 0; gint32 scripts[G_N_ELEMENTS (language_codes)]; - GUnicodeScript scc, sel; + GUnicodeScript scc, sel = G_UNICODE_SCRIPT_COMMON; p = part->content->data; memset (scripts, 0, sizeof (scripts)); @@ -1161,8 +1161,10 @@ detect_text_language (struct mime_text_part *part) lm = bsearch (&sel, language_codes, G_N_ELEMENTS (language_codes), sizeof (language_codes[0]), &language_elts_cmp); - part->lang_code = lm->code; - part->language = lm->name; + if (lm != NULL) { + part->lang_code = lm->code; + part->language = lm->name; + } } } } -- 2.39.5