summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/util/u_process.c19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/util/u_process.c b/src/util/u_process.c
index cbccf48ed01..371335303ec 100644
--- a/src/util/u_process.c
+++ b/src/util/u_process.c
@@ -33,6 +33,15 @@
#undef GET_PROGRAM_NAME
#if defined(__linux__) && defined(HAVE_PROGRAM_INVOCATION_NAME)
+
+static char *path = NULL;
+
+static void __freeProgramPath()
+{
+ free(path);
+ path = NULL;
+}
+
static const char *
__getProgramName()
{
@@ -45,14 +54,10 @@ __getProgramName()
* Strip these arguments out by using the realpath only if it was
* a prefix of the invocation name.
*/
- static char *path;
-
- if (!path)
- /* Note: realpath() allocates memory that we will keep around for
- * the lifetime of the app, and then leak as the app closes.
- * FIXME: we should find a way to clean this properly
- */
+ if (!path) {
path = realpath("/proc/self/exe", NULL);
+ atexit(__freeProgramPath);
+ }
if (path && strncmp(path, program_invocation_name, strlen(path)) == 0) {
/* This shouldn't be null because path is a a prefix,