diff --git a/ext/json/ext/parser/parser.c b/ext/json/ext/parser/parser.c
index c84c7ed6..45de8d1f 100644
--- a/ext/json/ext/parser/parser.c
+++ b/ext/json/ext/parser/parser.c
@@ -752,6 +752,9 @@ NOINLINE(static) VALUE json_string_unescape(JSON_ParserState *state, JSON_Parser
                 break;
             default:
                 if ((unsigned char)*pe < 0x20) {
+                    if (*pe == '\n') {
+                        raise_parse_error_at("Invalid unescaped newline character (\\n) in string: %s", state, pe - 1);
+                    }
                     raise_parse_error_at("invalid ASCII control character in string: %s", state, pe - 1);
                 }
                 raise_parse_error_at("invalid escape character in string: %s", state, pe - 1);
diff --git a/test/json/json_parser_test.rb b/test/json/json_parser_test.rb
index 257e4f17..3f0fb752 100644
--- a/test/json/json_parser_test.rb
+++ b/test/json/json_parser_test.rb
@@ -164,6 +164,14 @@ def test_parse_complex_objects
     end
   end
 
+  def test_parse_control_chars_in_string
+    0.upto(31) do |ord|
+      assert_raise JSON::ParserError do
+        parse(%("#{ord.chr}"))
+      end
+    end
+  end
+
   def test_parse_arrays
     assert_equal([1,2,3], parse('[1,2,3]'))
     assert_equal([1.2,2,3], parse('[1.2,2,3]'))