1 files changed, 15 insertions, 4 deletions

diff --git a/xs_json.h b/xs_json.h
index a9577ee..6f42eab 100644
--- a/xs_json.h
+++ b/xs_json.h
@@ -255,6 +255,9 @@ static xs_val *_xs_json_load_lexer(FILE *f, js_type *t)
                 case 'n': cp = '\n'; break;
                 case 'r': cp = '\r'; break;
                 case 't': cp = '\t'; break;
+                case '"': cp = '"'; break;
+                case '\\': cp = '\\'; break;
+                case '/': cp = '/'; break;
                 case 'u': /* Unicode codepoint as an hex char */
                     if (fscanf(f, "%04x", &cp) != 1) {
                         *t = JS_ERROR;
@@ -282,20 +285,28 @@ static xs_val *_xs_json_load_lexer(FILE *f, js_type *t)
                         cp += 0x2400;
 
                     break;
+
+                default:
+                    *t = JS_ERROR;
+                    break;
                 }
 
                 v = xs_utf8_insert(v, cp, &offset);
             }
             else {
-                char cc = c;
-                v = xs_insert_m(v, offset, &cc, 1);
+                if (c >= 0 && c < ' ') {
+                    v = xs_utf8_insert(v, c + 0x2400, &offset);
+                }
+                else {
+                    char cc = c;
+                    v = xs_insert_m(v, offset, &cc, 1);
+                    offset++;
+                }
 
                 if (!xs_is_string(v)) {
                     *t = JS_ERROR;
                     break;
                 }
-
-                offset++;
             }
         }