From 234fc04efb4854a150f995e1f91402eb28de0b68 Mon Sep 17 00:00:00 2001 From: DrSlony Date: Thu, 19 Mar 2015 09:39:36 +0100 Subject: [PATCH] Prevent segfault when locale invalid, issue 2717 --- rtgui/multilangmgr.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rtgui/multilangmgr.cc b/rtgui/multilangmgr.cc index 476dd4ba3..12b3173a0 100755 --- a/rtgui/multilangmgr.cc +++ b/rtgui/multilangmgr.cc @@ -138,10 +138,12 @@ Glib::ustring MultiLangMgr::getOSUserLanguage() { } #endif #elif defined(__linux__) || defined(__APPLE__) - langName = TranslateRFC2Language(setlocale(LC_CTYPE,"")); + char *tmplocale; + tmplocale = setlocale(LC_CTYPE,""); + if(tmplocale) + langName = TranslateRFC2Language(tmplocale); #endif } - return langName; }