From 5dde0d7c6d703a6797cbe3af8aa548ba23a1a024 Mon Sep 17 00:00:00 2001
From: Arnavion <arnavion@gmail.com>
Date: Sat, 31 Jan 2015 00:52:30 -0800
Subject: [PATCH] Also verify encoding read from servlist.conf

---
 src/common/servlist.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/servlist.c b/src/common/servlist.c
index 4951d4e5..92016366 100644
--- a/src/common/servlist.c
+++ b/src/common/servlist.c
@@ -1050,7 +1050,7 @@ servlist_load (void)
 				net->logintype = atoi (buf + 2);
 				break;
 			case 'E':
-				net->encoding = g_strdup (buf + 2);
+				net->encoding = servlist_check_encoding (buf + 2) ? g_strdup (buf + 2) : g_strdup ("UTF-8");
 				break;
 			case 'F':
 				net->flags = atoi (buf + 2);