procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix undefined behavior in json.c (Bug#42113)

Browse source 
* src/json.c (lisp_to_json_toplevel_1, Fjson_parse_string): Check
whether input strings are actually strings.

* test/src/json-tests.el (json-parse-string/wrong-type)
(json-serialize/wrong-hash-key-type): New regression tests.
This commit is contained in:
Philipp Stephani 2020-06-29 12:32:56 +02:00
parent cce00bef03
commit 59e768d64a
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/json.c
View file

@ -365,6 +365,7 @@ lisp_to_json_toplevel_1 (Lisp_Object lisp,
Lisp_Object key = HASH_KEY (h, i); Lisp_Object key = HASH_KEY (h, i);
if (!EQ (key, Qunbound)) if (!EQ (key, Qunbound))
{ {
CHECK_STRING (key);
Lisp_Object ekey = json_encode (key); Lisp_Object ekey = json_encode (key);
/* We can't specify the length, so the string must be /* We can't specify the length, so the string must be
NUL-terminated. */ NUL-terminated. */
@ -975,6 +976,7 @@ usage: (json-parse-string STRING &rest ARGS) */)
#endif #endif
Lisp_Object string = args[0]; Lisp_Object string = args[0];
CHECK_STRING (string);
Lisp_Object encoded = json_encode (string); Lisp_Object encoded = json_encode (string);
check_string_without_embedded_nuls (encoded); check_string_without_embedded_nuls (encoded);
struct json_configuration conf = struct json_configuration conf =

12
test/src/json-tests.el
View file

@ -296,5 +296,17 @@ Test with both unibyte and multibyte strings."
(1+ most-positive-fixnum) (1+ most-positive-fixnum)
(1- most-negative-fixnum))))) (1- most-negative-fixnum)))))
(ert-deftest json-parse-string/wrong-type ()
"Check that Bug#42113 is fixed."
(skip-unless (fboundp 'json-parse-string))
(should-error (json-parse-string 1) :type 'wrong-type-argument))
(ert-deftest json-serialize/wrong-hash-key-type ()
"Check that Bug#42113 is fixed."
(skip-unless (fboundp 'json-serialize))
(let ((table (make-hash-table :test #'eq)))
(puthash 1 2 table)
(should-error (json-serialize table) :type 'wrong-type-argument)))
(provide 'json-tests) (provide 'json-tests)
;;; json-tests.el ends here ;;; json-tests.el ends here