From 87645443b5c6dffea928a19c50aded605a28279c Mon Sep 17 00:00:00 2001 From: Mark Oteiza Date: Thu, 17 Aug 2017 20:00:52 -0400 Subject: Treat control characters in JSON strings as invalid * lisp/json.el (json-peek): Reduce to following-char. (json-pop, json-read): Zero (null char) means end of file. (json-read-escaped-char): Delimit URL properly. (json-read-string): Signal error for ASCII control characters. * test/lisp/json-tests.el (test-json-peek): Check for zero instead of :json-eof symbol. (test-json-read-string): New test for control characters in JSON strings. --- test/lisp/json-tests.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'test/lisp/json-tests.el') diff --git a/test/lisp/json-tests.el b/test/lisp/json-tests.el index c6bd295d667..1d13ccf074f 100644 --- a/test/lisp/json-tests.el +++ b/test/lisp/json-tests.el @@ -75,7 +75,7 @@ Point is moved to beginning of the buffer." (ert-deftest test-json-peek () (json-tests--with-temp-buffer "" - (should (eq (json-peek) :json-eof))) + (should (zerop (json-peek)))) (json-tests--with-temp-buffer "{ \"a\": 1 }" (should (equal (json-peek) ?{)))) @@ -164,6 +164,8 @@ Point is moved to beginning of the buffer." (should (equal (json-read-escaped-char) ?\")))) (ert-deftest test-json-read-string () + (json-tests--with-temp-buffer "\"formfeed\f\"" + (should-error (json-read-string) :type 'json-string-format)) (json-tests--with-temp-buffer "\"foo \\\"bar\\\"\"" (should (equal (json-read-string) "foo \"bar\""))) (json-tests--with-temp-buffer "\"abcαβγ\"" -- cgit v1.2.3