Merge lp:~ted/ubuntu-app-launch/tweaks-and-cleanups into lp:ubuntu-app-launch/15.10

Proposed by Ted Gould on 2015-06-09
Status: Merged
Approved by: Charles Kerr on 2015-08-06
Approved revision: 203
Merged at revision: 204
Proposed branch: lp:~ted/ubuntu-app-launch/tweaks-and-cleanups
Merge into: lp:ubuntu-app-launch/15.10
Diff against target: 26 lines (+5/-1)
2 files modified
libubuntu-app-launch/ubuntu-app-launch.c (+1/-1)
socket-demangler.c (+4/-0)
To merge this branch: bzr merge lp:~ted/ubuntu-app-launch/tweaks-and-cleanups
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2015-08-06
Charles Kerr (community) 2015-06-09 Approve on 2015-08-06
Review via email: mp+261522@code.launchpad.net

Commit message

Make demangler path more secure and unset internal environment variables

Description of the change

Thought there was a bug in UAL and fixed a couple things on the way. Turned out not to be an issue in UAL but thought I should push these little fixes out anyway.

To post a comment you must log in.
203. By Ted Gould on 2015-08-06

Switch to g_unsetenv()

Charles Kerr (charlesk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libubuntu-app-launch/ubuntu-app-launch.c'
2--- libubuntu-app-launch/ubuntu-app-launch.c 2015-06-04 20:22:27 +0000
3+++ libubuntu-app-launch/ubuntu-app-launch.c 2015-08-06 21:57:34 +0000
4@@ -2515,7 +2515,7 @@
5 /* The exec value */
6 gchar * envstr = NULL;
7 if (demangler) {
8- envstr = g_strdup_printf("APP_EXEC=" DEMANGLER_PATH " %s", execline);
9+ envstr = g_strdup_printf("APP_EXEC=%s %s", DEMANGLER_PATH, execline);
10 } else {
11 envstr = g_strdup_printf("APP_EXEC=%s", execline);
12 }
13
14=== modified file 'socket-demangler.c'
15--- socket-demangler.c 2015-05-21 20:09:44 +0000
16+++ socket-demangler.c 2015-08-06 21:57:34 +0000
17@@ -120,5 +120,9 @@
18
19 g_free(mirsocketbuf);
20
21+ /* Don't let people guess about these */
22+ g_unsetenv("UBUNTU_APP_LAUNCH_DEMANGLE_NAME");
23+ g_unsetenv("UBUNTU_APP_LAUNCH_DEMANGLE_PATH");
24+
25 return execvp(argv[1], argv + 1);
26 }

Subscribers

People subscribed via source and target branches