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

[Ted Gould]

Make demangler path more secure and unset internal environment variables

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.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:202
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/5/rebuild

review: Approve (continuous-integration)

[lp:~ted/ubuntu-app-launch/tweaks-and-cleanups]

203. By Ted Gould on 2015-08-06

Switch to g_unsetenv()

[Charles Kerr (charlesk)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:203
http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-armhf-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-app-launch-wily-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-app-launch-ci/11/rebuild

review: Approve (continuous-integration)

=== modified file 'libubuntu-app-launch/ubuntu-app-launch.c'
--- libubuntu-app-launch/ubuntu-app-launch.c	2015-06-04 20:22:27 +0000
+++ libubuntu-app-launch/ubuntu-app-launch.c	2015-08-06 21:57:34 +0000
@@ -2515,7 +2515,7 @@
 	/* The exec value */
 	gchar * envstr = NULL;
 	if (demangler) {
-		envstr = g_strdup_printf("APP_EXEC=" DEMANGLER_PATH " %s", execline);
+		envstr = g_strdup_printf("APP_EXEC=%s %s", DEMANGLER_PATH, execline);
 	} else {
 		envstr = g_strdup_printf("APP_EXEC=%s", execline);
 	}
 
=== modified file 'socket-demangler.c'
--- socket-demangler.c	2015-05-21 20:09:44 +0000
+++ socket-demangler.c	2015-08-06 21:57:34 +0000
@@ -120,5 +120,9 @@
 
 	g_free(mirsocketbuf);
 
+	/* Don't let people guess about these */
+	g_unsetenv("UBUNTU_APP_LAUNCH_DEMANGLE_NAME");
+	g_unsetenv("UBUNTU_APP_LAUNCH_DEMANGLE_PATH");
+
 	return execvp(argv[1], argv + 1);
 }