From 4faa7439720a6eb96db53e7b7a2846c7f6b5dc5c Mon Sep 17 00:00:00 2001 From: Emanuele Giaquinta Date: Sat, 17 May 2008 09:42:23 +0000 Subject: [PATCH] Pass NULL to settings_set_str to reset recode_fallback to its default value rather than hardcoding the string, fixes also a possible invalid g_free reported by Sven Wegener. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4829 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/fe-common/core/fe-recode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fe-common/core/fe-recode.c b/src/fe-common/core/fe-recode.c index ede672ec..2d0a991c 100644 --- a/src/fe-common/core/fe-recode.c +++ b/src/fe-common/core/fe-recode.c @@ -160,7 +160,7 @@ static void read_settings(void) if (!is_valid_charset(recode_fallback)) { signal_emit("error command", 2, GINT_TO_POINTER(CMDERR_INVALID_CHARSET), recode_fallback); g_free(recode_fallback); - recode_fallback = is_valid_charset(old_recode_fallback) ? g_strdup(old_recode_fallback) : "ISO8859-1"; + recode_fallback = is_valid_charset(old_recode_fallback) ? g_strdup(old_recode_fallback) : NULL; settings_set_str("recode_fallback", recode_fallback); }