more escaping

3 files changed, 5 insertions, 3 deletions

diff --git a/src/wasm.h b/src/wasm.h
index 3f3b7c271..601b88979 100644
--- a/src/wasm.h
+++ b/src/wasm.h
@@ -1037,7 +1037,7 @@ public:
     for (auto segment : module.memory.segments) {
       o << " (segment " << segment.offset << " \"";
       for (size_t i = 0; i < segment.size; i++) {
-        char c = segment.data[i];
+        unsigned char c = segment.data[i];
         switch (c) {
           case '\n': o << "\\n"; break;
           case '\r': o << "\\r"; break;
@@ -1045,6 +1045,8 @@ public:
           case '\f': o << "\\f"; break;
           case '\b': o << "\\b"; break;
           case '\\': o << "\\\\"; break;
+          case '"' : o << "\\\""; break;
+          case '\'' : o << "\\'"; break;
           default: {
             if (c >= 32 && c < 127) {
               o << c;
diff --git a/test/dot_s/global.wast b/test/dot_s/global.wast
index 08aaee176..211a696a6 100644
--- a/test/dot_s/global.wast
+++ b/test/dot_s/global.wast
@@ -1,5 +1,5 @@
 (module
-  (memory 0 4294967295 (segment 2 "9\05\00\00") (segment 6 "\00\00\00\00") (segment 10 "\01\00\00\00") (segment 14 "*\00\00\00") (segment 18 "\0ffffffff\0ffffffff\0ffffffff\0ffffffff") (segment 24 "\00\00\00\00\00\00\00\00") (segment 33 "\00\00\00\00\00\00\00\00") (segment 42 "\0ffffffff\0ffffffff\0ffffffff\0ffffffff\0ffffffff\0ffffffff\0ffffffff\0ffffffff") (segment 50 "\00\00\00\00") (segment 54 "\00\00\00\fffffff80") (segment 58 "\00\00\00@") (segment 63 "\00\00\00\00\00\00\00\00") (segment 72 "\00\00\00\00\00\00\00\00") (segment 81 "\00\00\00\00\00\00\00\00"))
+  (memory 0 4294967295 (segment 2 "9\05\00\00") (segment 6 "\00\00\00\00") (segment 10 "\01\00\00\00") (segment 14 "*\00\00\00") (segment 18 "\ff\ff\ff\ff") (segment 24 "\00\00\00\00\00\00\00\00") (segment 33 "\00\00\00\00\00\00\00\00") (segment 42 "\ff\ff\ff\ff\ff\ff\ff\ff") (segment 50 "\00\00\00\00") (segment 54 "\00\00\00\80") (segment 58 "\00\00\00@") (segment 63 "\00\00\00\00\00\00\00\00") (segment 72 "\00\00\00\00\00\00\00\00") (segment 81 "\00\00\00\00\00\00\00\00"))
   (func $foo (result i32)
     (block $fake_return_waka123
       (block
diff --git a/test/dot_s/permute.wast b/test/dot_s/permute.wast
index 0a728ac2d..6d04518cd 100644
--- a/test/dot_s/permute.wast
+++ b/test/dot_s/permute.wast
@@ -1,3 +1,3 @@
 (module
-  (memory 0 4294967295 (segment 4 "hE?\fffffff9fffffffds\0e7\fffffffefffffffb[g\fffffff9ffffffff\fffffffafffffff55it\fffffffdfffffff4k\0b\fffffffffffffff2\ffffffffffffffff\fffffffcfffffffcld\fffffffe0\0fffffffd\fffffff9fffffffc\fffffffafffffffe\fffffff9fffffff6&~\fffffffefffffff8\fffffffafffffff4\fffffff9fffffff9+\fffffffdfffffff8\fffffffbfffffff4\fffffffdfffffff2\0fffffff2\0fffffffb\12\1cej\fffffffefffffff99\fffffffcfffffff7\fffffffcfffffff3W\fffffffdfffffff6w\fffffffbffffffff\fffffffbfffffffe\fffffffdfffffffaM>\fffffffafffffff2ub\fffffffafffffff6\fffffff9fffffff4\fffffffcfffffff6\fffffffb0N\fffffffffffffffc;q\11\0fffffff7\fffffffcffffffff\fffffffffffffff31\fffffffffffffff6\fffffffbfffffff7\fffffff90\0fffffffc\03\fffffffffffffff4\fffffffbfffffffa\fffffffefffffff7\fffffffdfffffffc- \15\fffffff9fffffff3DH\fffffff80r\0fffffffa\01X\fffffffffffffffb:_\00A\fffffffdfffffffd\fffffffffffffff9o`n\fffffffbfffffffc(\fffffffbfffffffd\fffffffcfffffffa0\fffffffefffffffcyS#\0fffffff4$"\fffffff9fffffff2\7f}\fffffff9fffffffe\0fffffff6\fffffffafffffff3L'\fffffffcfffffffb\fffffffcfffffffdZ\fffffffffffffffd4\18\0fffffff3\fffffffc0\fffffffdffffffff\0ffffffff\fffffffbfffffff3\0fffffff8\07\05\fffffffafffffffc\fffffffefffffff3\0f\fffffffa0\06m%\\\0fffffff9^B<\fffffffffffffff7\fffffffcfffffff1\17\fffffffafffffff8]\f\fffffffefffffffd\fffffffdfffffff5\0fffffff5p\fffffffffffffff5\0fffffffezJ\fffffffbfffffffb,F\fffffffbfffffff5@\bR\fffffff9fffffff5!\fffffffcfffffff8\1a\fffffffdfffffffe\fffffffefffffff5\04\nI\fffffffbfffffff6\fffffffefffffff1\fffffffaffffffff\fffffff9fffffffa\fffffffdfffffff9\fffffffbfffffff9|\fffffffafffffff7\fffffffafffffffaG\fffffffcfffffffe8Y\fffffff9fffffffb\fffffffdfffffff1\1b\fffffffefffffff4\fffffffffffffffa\fffffffcfffffff9\19\14\fffffffafffffffb\fffffffafffffff163\fffffffd0\1d\fffffffefffffff2\fffffffeffffffff=C\1f\rc\fffffffffffffff1\fffffffdfffffff7QUv\02\fffffffcfffffff5aK\fffffffcfffffff4\tV\fffffffdfffffff3x\fffffffffffffff8\fffffffbfffffff1\1e\fffffff9fffffff1\fffffffefffffffe/{\fffffffefffffffa\fffffffefffffff6Pf\10T\ffffffff0)\fffffff9fffffff8\16\fffffffffffffffe\fffffffbfffffff8\fffffffafffffffd\0fffffff1\fffffffdfffffffbO*\fffffffcfffffff2\fffffffafffffff9\132\fffffff9fffffff7.\fffffffbfffffff2"))
+  (memory 0 4294967295 (segment 4 "hE?\8ds\0e7\db[g\8f\955it\c4k\0b\e2\ef\bcld\e0\fd\8c\9e\86&~\d8\94\89+\c8\a4\c2\f2\fb\12\1cej\d99\b7\b3W\c6w\af\ae\caM>\92ub\96\84\b6\b0N\ec;q\11\f7\bf\e31\e6\a7\90\fc\03\e4\aa\d7\cc- \15\83DH\80r\fa\01X\eb:_\00A\cd\e9o`n\ac(\ad\ba0\dcyS#\f4$\"\82\7f}\8e\f6\93L\'\bb\bdZ\ed4\18\f3\c0\cf\ff\a3\f8\07\05\9c\d3\0f\a0\06m%\\\f9^B<\e7\b1\17\98]\f\dd\c5\f5p\e5\fezJ\ab,F\a5@\bR\85!\b8\1a\ce\d5\04\nI\a6\d1\9f\8a\c9\a9|\97\9aG\be8Y\8b\c1\1b\d4\ea\b9\19\14\9b\9163\d0\1d\d2\df=C\1f\rc\e1\c7QUv\02\b5aK\b4\tV\c3x\e8\a1\1e\81\de/{\da\d6Pf\10T\f0)\88\16\ee\a8\9d\f1\cbO*\b2\99\132\87.\a2"))
 )