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
This commit is contained in:
Vincent Untz 2010-09-30 15:21:58 +02:00
parent 109de6a356
commit c6eb2761c7

View File

@ -246,7 +246,11 @@ def start_shell(perf_output=None):
if pkgconfig.returncode == 0: if pkgconfig.returncode == 0:
mozjs_libdir = re.sub('-(sdk|devel)', '', mozjs_sdkdir) mozjs_libdir = re.sub('-(sdk|devel)', '', mozjs_sdkdir)
if os.path.exists(mozjs_libdir + '/libmozjs.so'): 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") # Log everything to stderr (make stderr our "log file")
env['GJS_DEBUG_OUTPUT'] = 'stderr' env['GJS_DEBUG_OUTPUT'] = 'stderr'