[gnome-shell] gnome-shell.in: Never add empty elements to LD_LIBRARY_PATH
- From: Vincent Untz <vuntz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] gnome-shell.in: Never add empty elements to LD_LIBRARY_PATH
- Date: Thu, 30 Sep 2010 14:32:15 +0000 (UTC)
commit c6eb2761c719af47248badb2187866ffaff6e671
Author: Vincent Untz <vuntz gnome org>
Date: Thu Sep 30 15:21:58 2010 +0200
gnome-shell.in: Never add empty elements to LD_LIBRARY_PATH
An empty element means the current directory, and is insecure.
https://bugzilla.gnome.org/show_bug.cgi?id=631004
src/gnome-shell.in | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/src/gnome-shell.in b/src/gnome-shell.in
index 163ecfc..b523bde 100755
--- a/src/gnome-shell.in
+++ b/src/gnome-shell.in
@@ -246,7 +246,11 @@ def start_shell(perf_output=None):
if pkgconfig.returncode == 0:
mozjs_libdir = re.sub('-(sdk|devel)', '', mozjs_sdkdir)
if os.path.exists(mozjs_libdir + '/libmozjs.so'):
- env['LD_LIBRARY_PATH'] = os.environ.get('LD_LIBRARY_PATH', '') + ':' + mozjs_libdir
+ if 'LD_LIBRARY_PATH' in env:
+ ld_library_path = env['LD_LIBRARY_PATH'] + ':' + mozjs_libdir
+ else:
+ ld_library_path = mozjs_libdir
+ env['LD_LIBRARY_PATH'] = ld_library_path
# Log everything to stderr (make stderr our "log file")
env['GJS_DEBUG_OUTPUT'] = 'stderr'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]