Fix memory string initializer to generate format that is safe for text files. Perform Emscripten optimizer cleanup pass in binary file read and write mode to not get confused by the special characters in the string initializer. Skip closure compiler when memory string initializer is used on Windows, since closure trips over when presented with such input.

Author: juj

tests/test_browser.py

@@ -2766,7 +2766,8 @@ def test_meminit_pairs(self):
     args = ["-O2", "--memory-init-file", "0", "-s", "MEM_INIT_METHOD=2", "-s", "ASSERTIONS=1"]
     self.btest(d, expected='0', args=args + ["--closure", "0"])
     self.btest(d, expected='0', args=args + ["--closure", "0", "-g"])
-    self.btest(d, expected='0', args=args + ["--closure", "1"])
+    if not WINDOWS: # Closure compiler fails on Windows when it receives the unexpected characters in memory string initializer.
+      self.btest(d, expected='0', args=args + ["--closure", "1"])
 
   def test_meminit_big(self):
     d = 'const char *data[] = {\n  "'
@@ -2778,7 +2779,8 @@ def test_meminit_big(self):
     args = ["-O2", "--memory-init-file", "0", "-s", "MEM_INIT_METHOD=2", "-s", "ASSERTIONS=1"]
     self.btest(d, expected='0', args=args + ["--closure", "0"])
     self.btest(d, expected='0', args=args + ["--closure", "0", "-g"])
-    self.btest(d, expected='0', args=args + ["--closure", "1"])
+    if not WINDOWS: # Closure compiler fails on Windows when it receives the unexpected characters in memory string initializer.
+      self.btest(d, expected='0', args=args + ["--closure", "1"])
 
   def test_wasm_polyfill_prototype(self):
     self.clear()

tools/js_optimizer.py

@@ -458,7 +458,7 @@ def write_chunk(chunk, i):
     cl_sep = 'wakaUnknownBefore(); var asm=wakaUnknownAfter(global,env,buffer)\n'
 
     cle = temp_files.get('.cl.js').name
-    c = open(cle, 'w')
+    c = open(cle, 'wb')
     pre_1, pre_2 = pre.split(start_asm)
     post_1, post_2 = post.split(end_asm)
     c.write(pre_1)
@@ -469,7 +469,7 @@ def write_chunk(chunk, i):
     if split_memory:
       if DEBUG: print >> sys.stderr, 'running splitMemory on shell code'
       cld = run_on_chunk(js_engine + [JS_OPTIMIZER, cld, 'splitMemoryShell'])
-      f = open(cld, 'a')
+      f = open(cld, 'ab')
       f.write(suffix_marker)
       f.close()
     if closure:
@@ -480,9 +480,9 @@ def write_chunk(chunk, i):
       if DEBUG: print >> sys.stderr, 'running cleanup on shell code'
       next = cld + '.cl.js'
       temp_files.note(next)
-      subprocess.Popen(js_engine + [JS_OPTIMIZER, cld, 'noPrintMetadata'] + (['minifyWhitespace'] if 'minifyWhitespace' in passes else []), stdout=open(next, 'w')).communicate()
+      subprocess.Popen(js_engine + [JS_OPTIMIZER, cld, 'noPrintMetadata'] + (['minifyWhitespace'] if 'minifyWhitespace' in passes else []), stdout=open(next, 'wb')).communicate()
       cld = next
-    coutput = open(cld).read()
+    coutput = open(cld, 'rb').read()
     coutput = coutput.replace('wakaUnknownBefore();', start_asm)
     after = 'wakaUnknownAfter'
     start = coutput.find(after)
@@ -491,15 +491,15 @@ def write_chunk(chunk, i):
     post = post_1 + end_asm + coutput[end+1:]
 
   filename += '.jo.js'
-  f = open(filename, 'w')
+  f = open(filename, 'wb')
   f.write(pre);
   pre = None
 
   if not just_concat:
     # sort functions by size, to make diffing easier and to improve aot times
     funcses = []
     for out_file in filenames:
-      funcses.append(split_funcs(open(out_file).read(), False))
+      funcses.append(split_funcs(open(out_file, 'rb').read(), False))
     funcs = [item for sublist in funcses for item in sublist]
     funcses = None
     def sorter(x, y):
@@ -522,11 +522,11 @@ def sorter(x, y):
   else:
     # just concat the outputs
     for out_file in filenames:
-      f.write(open(out_file).read())
-  f.write('\n')
+      f.write(open(out_file, 'rb').read())
+  f.write(os.linesep) # Writing in binary mode, so make sure to generate correct newline output
   f.write(post);
   # No need to write suffix: if there was one, it is inside post which exists when suffix is there
-  f.write('\n')
+  f.write(os.linesep)
   f.close()
 
   return filename

tools/shared.py

@@ -1896,7 +1896,9 @@ def generate_string_initializer(s):
     s = s.replace('\\', '\\\\').replace("'", "\\'")
     s = s.replace('\n', '\\n').replace('\r', '\\r')
     def escape(x): return '\\x{:02x}'.format(ord(x.group()))
-    return re.sub('[\x80-\xff]', escape, s)
+    s = re.sub('\x00(?![0-9])', '\\0', s) # Don't allow a null byte in the generated output file.
+    s = re.sub('[\x00-\x1f\x80-\xff]', escape, s) # Don't allow ASCII chars 0-31 or 128-255 in the generated output file.
+    return s
 
 def execute(cmd, *args, **kw):
   try: