Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-06-27 17:24:55 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-06-27 17:24:55 +0400
commitb466a5c9a9f1147da9f3c0e5970c740b62e142f5 (patch)
treefa8f3df0da2aaea3cbc2e8bb921dbf80b3fed70c /intern/locale
parentee85587a4368d568f1310e3c6bc0a8e225c0c4dc (diff)
Fix #35890: memory leak in OS X ghost locale detection.
Diffstat (limited to 'intern/locale')
-rw-r--r--intern/locale/boost_locale_wrapper.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/locale/boost_locale_wrapper.cpp b/intern/locale/boost_locale_wrapper.cpp
index 3492ec05e82..5d7ba599467 100644
--- a/intern/locale/boost_locale_wrapper.cpp
+++ b/intern/locale/boost_locale_wrapper.cpp
@@ -65,8 +65,8 @@ void bl_locale_set(const char *locale)
}
else {
#ifdef __APPLE__
- extern const char *user_locale; // pulled from Ghost_SystemCocoa
- std::string locale_osx = user_locale + std::string(".UTF-8");
+ extern char GHOST_user_locale[128]; // pulled from Ghost_SystemCocoa
+ std::string locale_osx = GHOST_user_locale + std::string(".UTF-8");
_locale = gen(locale_osx.c_str());
#else
_locale = gen("");