summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgmont Koblinger <egmont@gmail.com>2018-09-23 12:55:46 +0200
committerEgmont Koblinger <egmont@gmail.com>2018-09-23 12:57:42 +0200
commite3ed022308860a6c90935d4c663e9e90be3883c0 (patch)
treee77c9dd7891cedce358a44a60806d2a4d9a36f5d
parenta39489aa11044b572c6bc5141770a989881c3686 (diff)
downloadvte-0.54.1.tar.gz
conv: Fix crash after multiple encoding changes0.54.1
https://gitlab.gnome.org/GNOME/vte/issues/50 (cherry picked from commit cb315a4c4162a543f910cb0c11a8cf91bd17b0e4)
-rw-r--r--src/vte.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/vte.cc b/src/vte.cc
index 90a0f461..6c9f70f9 100644
--- a/src/vte.cc
+++ b/src/vte.cc
@@ -1967,6 +1967,8 @@ Terminal::set_encoding(char const* codeset)
g_iconv_close(m_incoming_conv);
if (m_outgoing_conv != ((GIConv)-1))
g_iconv_close(m_outgoing_conv);
+ m_incoming_conv = (GIConv)-1;
+ m_outgoing_conv = (GIConv)-1;
} else {
auto outconv = g_iconv_open(codeset, "UTF-8");
if (outconv == ((GIConv)-1))