summaryrefslogtreecommitdiff
path: root/gtk2_ardour/bundle_env_linux.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2015-04-17 11:00:33 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2015-04-17 11:00:33 -0400
commit76b28e7ff22a5829da275e29e26faac404a107ae (patch)
tree5857a72c1efae57e7f6d63f31762fefcce5c9b9a /gtk2_ardour/bundle_env_linux.cc
parentdff83c77cf1e0aa397cafbf7bca705eb3d1800e5 (diff)
fix novice-level mistake that causes localedir to point to random, reusable (typically stack) memory
Diffstat (limited to 'gtk2_ardour/bundle_env_linux.cc')
-rw-r--r--gtk2_ardour/bundle_env_linux.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/bundle_env_linux.cc b/gtk2_ardour/bundle_env_linux.cc
index 54404b14fb..1766021da1 100644
--- a/gtk2_ardour/bundle_env_linux.cc
+++ b/gtk2_ardour/bundle_env_linux.cc
@@ -46,7 +46,7 @@ using namespace ARDOUR;
using namespace std;
void
-fixup_bundle_environment (int /*argc*/, char* argv[], const char** localedir)
+fixup_bundle_environment (int /*argc*/, char* argv[], string & localedir)
{
/* THIS IS FOR LINUX - its just about the only place where its
* acceptable to build paths directly using '/'.
@@ -63,14 +63,14 @@ fixup_bundle_environment (int /*argc*/, char* argv[], const char** localedir)
#ifdef ENABLE_NLS
if (!ARDOUR::translations_are_enabled ()) {
- (*localedir) = "/this/cannot/exist";
+ localedir = "/this/cannot/exist";
} else {
/* force localedir into the bundle */
vector<string> lpath;
lpath.push_back (dir_path);
lpath.push_back ("share");
lpath.push_back ("locale");
- (*localedir) = canonical_path (Glib::build_filename (lpath)).c_str();
+ localedir = canonical_path (Glib::build_filename (lpath)).c_str();
}
#endif