aboutsummaryrefslogtreecommitdiff
path: root/emscripten.py
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-09-01 19:45:59 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-09-03 14:41:31 -0700
commit8f7e8962758803120bd3dcbbf059d88d1c892121 (patch)
treea2523e9031c0830f08d1ec9bf0c9f4f8af84a12d /emscripten.py
parent976d1636b37206c06f33c7ba3cdce01ae4cd7409 (diff)
assert guards against cross-module stack leaks
Diffstat (limited to 'emscripten.py')
-rwxr-xr-xemscripten.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/emscripten.py b/emscripten.py
index d4e4641c..3b459760 100755
--- a/emscripten.py
+++ b/emscripten.py
@@ -480,6 +480,7 @@ def emscript(infile, settings, outfile, libraries=[], compiler_engine=None,
''' % (sig, i, args, arg_coercions, jsret))
from tools import shared
+ shared.Settings.copy(settings)
asm_setup += '\n' + shared.JS.make_invoke(sig) + '\n'
basic_funcs.append('invoke_%s' % sig)
@@ -685,7 +686,7 @@ def main(args, compiler_engine, cache, jcache, relooper, temp_files, DEBUG, DEBU
for setting in args.settings:
name, value = setting.strip().split('=', 1)
settings[name] = json.loads(value)
-
+
# libraries
libraries = args.libraries[0].split(',') if len(args.libraries) > 0 else []