Allow non-printable characters inside quoted string literals.

Fixed issue nodeca#192.
niksy · Nov 21, 2015 · a14d85c · a14d85c
1 parent 73c7421
commit a14d85c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/js-yaml/loader.js b/lib/js-yaml/loader.js
@@ -252,6 +252,8 @@ function captureSegment(state, start, end, checkJson) {
           throwError(state, 'expected valid JSON character');
         }
       }
+    } else if (PATTERN_NON_PRINTABLE.test(_result)) {
+      throwError(state, 'the stream contains non-printable characters');
     }
 
     state.result += _result;
@@ -1522,10 +1524,6 @@ function loadDocuments(input, options) {
 
   var state = new State(input, options);
 
-  if (PATTERN_NON_PRINTABLE.test(state.input)) {
-    throwError(state, 'the stream contains non-printable characters');
-  }
-
   // Use 0 as string terminator. That significantly simplifies bounds check.
   state.input += '\0';
 

diff --git a/test/units/character-set.js b/test/units/character-set.js
@@ -19,7 +19,10 @@ test('Forbid lone surrogates', function () {
   assert.throws(function () { yaml.load('\udc00\ud800'); }, yaml.YAMLException);
 });
 
-test.skip('Allow non-printable characters inside quoted scalars', function () {
+test('Allow non-printable characters inside quoted scalars', function () {
   assert.strictEqual(yaml.load('"\x7f\x9f\udc00\ud800"'), '\x7f\x9f\udc00\ud800');
 });
 
+test('Forbid control sequences inside quoted scalars', function () {
+  assert.throws(function () { yaml.load('"\x03"'); }, yaml.YAMLException);
+});