isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome-shell.in: Really never add empty elements to LD_LIBRARY_PATH

Browse Source 
This complements the fix from c6eb2761, to make sure that we don't use
the pre-existing $LD_LIBRARY_PATH if it's set but empty.

Both commits fix CVE-2010-4000.

https://bugzilla.gnome.org/show_bug.cgi?id=638728
This commit is contained in:
Vincent Untz 2011-01-05 10:32:44 +01:00
parent ad67225bf8
commit 7beb7e0f65
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gnome-shell.in
View File

@ -152,7 +152,7 @@ def start_dconf_await_service():
# dconf is linked without libtool, so unlike other GNOME modules, # dconf is linked without libtool, so unlike other GNOME modules,
# won't have an embedded rpath for its library directory. # won't have an embedded rpath for its library directory.
env = dict(os.environ) env = dict(os.environ)
if 'LD_LIBRARY_PATH' in env: if 'LD_LIBRARY_PATH' in env and env['LD_LIBRARY_PATH']:
ld_library_path = '@libdir@:' + env['LD_LIBRARY_PATH'] ld_library_path = '@libdir@:' + env['LD_LIBRARY_PATH']
else: else:
ld_library_path = '@libdir@' ld_library_path = '@libdir@'
@ -246,7 +246,7 @@ 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'):
if 'LD_LIBRARY_PATH' in env: if 'LD_LIBRARY_PATH' in env and env['LD_LIBRARY_PATH']:
ld_library_path = env['LD_LIBRARY_PATH'] + ':' + mozjs_libdir ld_library_path = env['LD_LIBRARY_PATH'] + ':' + mozjs_libdir
else: else:
ld_library_path = mozjs_libdir ld_library_path = mozjs_libdir