Merge c66722ca9a into e244146dfd

3 years ago · d980277782
--- a/README.md
+++ b/README.md
@@ -33,6 +33,7 @@ Build Status

 Test Status
 * [Coveralls](https://coveralls.io/github/json-c/json-c?branch=master) [![Coverage Status](https://coveralls.io/repos/github/json-c/json-c/badge.svg?branch=master)](https://coveralls.io/github/json-c/json-c?branch=master)
 * [TrustInSoft CI](https://ci.trust-in-soft.com/projects/json-c/json-c/latest) [![TrustInSoft CI](https://ci.trust-in-soft.com/projects/json-c/json-c.svg)](https://ci.trust-in-soft.com/projects/json-c/json-c)

 Building on Unix with `git`, `gcc` and `cmake` <a name="buildunix"></a>
 --------------------------------------------------
--- a/json_tokener.c
+++ b/json_tokener.c
@@ -148,6 +148,7 @@ enum json_tokener_error json_tokener_get_error(struct json_tokener *tok)
 #define DECODE_SURROGATE_PAIR(hi, lo) ((((hi)&0x3FF) << 10) + ((lo)&0x3FF) + 0x10000)
 static unsigned char utf8_replacement_char[3] = {0xEF, 0xBF, 0xBD};

 /*@ requires depth_is_non_negative: depth >= 0; */
 struct json_tokener *json_tokener_new_ex(int depth)
 {
 	struct json_tokener *tok;
--- a/linkhash.c
+++ b/linkhash.c
@@ -35,7 +35,13 @@
 /* hash functions */
 static unsigned long lh_char_hash(const void *k);
 static unsigned long lh_perllike_str_hash(const void *k);

 #ifdef __TRUSTINSOFT_ANALYZER__
 /* Use a simpler hash function for TrustInSoft Analyzer. */
 static lh_hash_fn *char_hash_fn = lh_perllike_str_hash;
 #else
 static lh_hash_fn *char_hash_fn = lh_char_hash;
 #endif

 /* comparison functions */
 int lh_char_equal(const void *k1, const void *k2);
--- a/tis.config
+++ b/tis.config
--- a/trustinsoft/common.config
+++ b/trustinsoft/common.config
@@ -0,0 +1,26 @@
 {
    "files": [
        "../arraylist.c",
        "../debug.c",
        "../json_c_version.c",
        "../json_object.c",
        "../json_object_iterator.c",
        "../json_pointer.c",
        "../json_tokener.c",
        "../json_util.c",
        "../json_visit.c",
        "../libjson.c",
        "../linkhash.c",
        "../printbuf.c",
        "../random_seed.c",
        "../strerror_override.c",
        "../tests/parse_flags.c"
    ],
    "compilation_cmd": "-Iinclude -I.. -I../tests",
    "val-printf-singleton-pointers": true,
    "val-int-for-pointer-equality": [
        "-1",
        "-2"
    ],
    "safe-arrays": false
 }
--- a/trustinsoft/fuzz_inputs/0-000a80a246.json
+++ b/trustinsoft/fuzz_inputs/0-000a80a246.json
@@ -0,0 +1 @@
 [-0.0000000000000000000000000000000001]
--- a/trustinsoft/fuzz_inputs/0-00308ed1d3.json
+++ b/trustinsoft/fuzz_inputs/0-00308ed1d3.json
@@ -0,0 +1 @@
 [a嬁
--- a/trustinsoft/fuzz_inputs/0-019bdda640.json
+++ b/trustinsoft/fuzz_inputs/0-019bdda640.json
@@ -0,0 +1 @@
 [ 4]
--- a/trustinsoft/fuzz_inputs/0-021e295090.json
+++ b/trustinsoft/fuzz_inputs/0-021e295090.json
@@ -0,0 +1 @@
 [1e+2]
--- a/trustinsoft/fuzz_inputs/0-021fb596db.json
+++ b/trustinsoft/fuzz_inputs/0-021fb596db.json
@@ -0,0 +1 @@
 {
--- a/trustinsoft/fuzz_inputs/0-03483610a1.json
+++ b/trustinsoft/fuzz_inputs/0-03483610a1.json
@@ -0,0 +1 @@
 ["\uDBFF\uDFFF"]
--- a/trustinsoft/fuzz_inputs/0-03514ff57d.json
+++ b/trustinsoft/fuzz_inputs/0-03514ff57d.json
@@ -0,0 +1 @@
 [[]   ]
--- a/trustinsoft/fuzz_inputs/0-0389d0d592.json
+++ b/trustinsoft/fuzz_inputs/0-0389d0d592.json
@@ -0,0 +1 @@
 ['single quote']
--- a/trustinsoft/fuzz_inputs/0-055539df4a.json
+++ b/trustinsoft/fuzz_inputs/0-055539df4a.json
@@ -0,0 +1 @@
 [""]
--- a/trustinsoft/fuzz_inputs/0-0670457419.json
+++ b/trustinsoft/fuzz_inputs/0-0670457419.json
@@ -0,0 +1 @@
 [1:2
--- a/trustinsoft/fuzz_inputs/0-06c269b630.json
+++ b/trustinsoft/fuzz_inputs/0-06c269b630.json
@@ -0,0 +1 @@
 [1e�
--- a/trustinsoft/fuzz_inputs/0-0791dee428.json
+++ b/trustinsoft/fuzz_inputs/0-0791dee428.json
@@ -0,0 +1 @@
 [0.3e]
--- a/trustinsoft/fuzz_inputs/0-090a03d2cb.json
+++ b/trustinsoft/fuzz_inputs/0-090a03d2cb.json
@@ -0,0 +1 @@
 [1ea
--- a/trustinsoft/fuzz_inputs/0-0937993255.json
+++ b/trustinsoft/fuzz_inputs/0-0937993255.json
@@ -0,0 +1 @@
 [1.0e+]
--- a/trustinsoft/fuzz_inputs/0-093f3d1b0f.json
+++ b/trustinsoft/fuzz_inputs/0-093f3d1b0f.json
@@ -0,0 +1 @@
 ["\uFDD0"]
--- a/trustinsoft/fuzz_inputs/0-097f620d51.json
+++ b/trustinsoft/fuzz_inputs/0-097f620d51.json
@@ -0,0 +1 @@
 [0.4e0069999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999969999999006]
--- a/trustinsoft/fuzz_inputs/0-09f37da007.json
+++ b/trustinsoft/fuzz_inputs/0-09f37da007.json
@@ -0,0 +1 @@
 [0x1
--- a/trustinsoft/fuzz_inputs/0-0b57963f9b.json
+++ b/trustinsoft/fuzz_inputs/0-0b57963f9b.json
@@ -0,0 +1 @@
 [++1
--- a/trustinsoft/fuzz_inputs/0-0babba2e2f.json
+++ b/trustinsoft/fuzz_inputs/0-0babba2e2f.json
@@ -0,0 +1 @@
 {a: 
--- a/trustinsoft/fuzz_inputs/0-0bacf2e644.json
+++ b/trustinsoft/fuzz_inputs/0-0bacf2e644.json
@@ -0,0 +1 @@
 [123e65]
--- a/trustinsoft/fuzz_inputs/0-0cc9076470.json
+++ b/trustinsoft/fuzz_inputs/0-0cc9076470.json
@@ -0,0 +1 @@
 {"a" "b"}
--- a/trustinsoft/fuzz_inputs/0-0cd3133261.json
+++ b/trustinsoft/fuzz_inputs/0-0cd3133261.json
@@ -0,0 +1 @@
 ["\u0022"]
--- a/trustinsoft/fuzz_inputs/0-0eb5b8d6f8.json
+++ b/trustinsoft/fuzz_inputs/0-0eb5b8d6f8.json
@@ -0,0 +1 @@
 ["a"]
--- a/trustinsoft/fuzz_inputs/0-10058b8cd9.json
+++ b/trustinsoft/fuzz_inputs/0-10058b8cd9.json
@@ -0,0 +1 @@
 [Infinity]
--- a/trustinsoft/fuzz_inputs/0-112c1de300.json
+++ b/trustinsoft/fuzz_inputs/0-112c1de300.json
@@ -0,0 +1 @@
 ["\uD801\udc37"]
--- a/trustinsoft/fuzz_inputs/0-1197788777.json
+++ b/trustinsoft/fuzz_inputs/0-1197788777.json
@@ -0,0 +1 @@
 [1+2
--- a/trustinsoft/fuzz_inputs/0-12ae32cb1e.json
+++ b/trustinsoft/fuzz_inputs/0-12ae32cb1e.json
@@ -0,0 +1 @@
 ""
--- a/trustinsoft/fuzz_inputs/0-12d3b5ee1e.json
+++ b/trustinsoft/fuzz_inputs/0-12d3b5ee1e.json
@@ -0,0 +1 @@
 [⁠
--- a/trustinsoft/fuzz_inputs/0-14c644de0d.json
+++ b/trustinsoft/fuzz_inputs/0-14c644de0d.json
@@ -0,0 +1 @@
 [null, 1, "1", {}]
--- a/trustinsoft/fuzz_inputs/0-1522be6352.json
+++ b/trustinsoft/fuzz_inputs/0-1522be6352.json
@@ -0,0 +1 @@
 ["\uD83F\uDFFE"]
--- a/trustinsoft/fuzz_inputs/0-15460fde9b.json
+++ b/trustinsoft/fuzz_inputs/0-15460fde9b.json
@@ -0,0 +1 @@
 [0å]
--- a/trustinsoft/fuzz_inputs/0-15b3359196.json
+++ b/trustinsoft/fuzz_inputs/0-15b3359196.json
@@ -0,0 +1 @@
 [123e45]
--- a/trustinsoft/fuzz_inputs/0-1634237d36.json
+++ b/trustinsoft/fuzz_inputs/0-1634237d36.json
@@ -0,0 +1 @@
 ["\	
--- a/trustinsoft/fuzz_inputs/0-17dc4691fa.json
+++ b/trustinsoft/fuzz_inputs/0-17dc4691fa.json
@@ -0,0 +1 @@
 ["\uDd1e\uD834"]
--- a/trustinsoft/fuzz_inputs/0-18d428401e.json
+++ b/trustinsoft/fuzz_inputs/0-18d428401e.json
@@ -0,0 +1 @@
 ["a
--- a/trustinsoft/fuzz_inputs/0-19ac7ea02e.json
+++ b/trustinsoft/fuzz_inputs/0-19ac7ea02e.json
@@ -0,0 +1 @@
 {'a'
--- a/trustinsoft/fuzz_inputs/0-1a9f370852.json
+++ b/trustinsoft/fuzz_inputs/0-1a9f370852.json
@@ -0,0 +1 @@
 ["\u0012"]
--- a/trustinsoft/fuzz_inputs/0-1b45efc13b.json
+++ b/trustinsoft/fuzz_inputs/0-1b45efc13b.json
@@ -0,0 +1 @@
 [1.0e]
--- a/trustinsoft/fuzz_inputs/0-1c1ef70149.json
+++ b/trustinsoft/fuzz_inputs/0-1c1ef70149.json
@@ -0,0 +1 @@
 ["\u�"]
--- a/trustinsoft/fuzz_inputs/0-1c28f2eb09.json
+++ b/trustinsoft/fuzz_inputs/0-1c28f2eb09.json
@@ -0,0 +1 @@
 [true]
--- a/trustinsoft/fuzz_inputs/0-1c3c00c78c.json
+++ b/trustinsoft/fuzz_inputs/0-1c3c00c78c.json
@@ -0,0 +1 @@
 {"foo\u0000bar": 42}
--- a/trustinsoft/fuzz_inputs/0-1d4777abe1.json
+++ b/trustinsoft/fuzz_inputs/0-1d4777abe1.json
@@ -0,0 +1 @@
 [1E+2]
--- a/trustinsoft/fuzz_inputs/0-1d8fc6ceb1.json
+++ b/trustinsoft/fuzz_inputs/0-1d8fc6ceb1.json
@@ -0,0 +1 @@
 [null]
--- a/trustinsoft/fuzz_inputs/0-1deed1d598.json
+++ b/trustinsoft/fuzz_inputs/0-1deed1d598.json
@@ -0,0 +1 @@
 ["\u200B"]
--- a/trustinsoft/fuzz_inputs/0-1e4a55bc32.json
+++ b/trustinsoft/fuzz_inputs/0-1e4a55bc32.json
@@ -0,0 +1 @@
 ["����"]
--- a/trustinsoft/fuzz_inputs/0-201add1424.json
+++ b/trustinsoft/fuzz_inputs/0-201add1424.json
@@ -0,0 +1 @@
 [123]
--- a/trustinsoft/fuzz_inputs/0-20f9fd883f.json
+++ b/trustinsoft/fuzz_inputs/0-20f9fd883f.json
@@ -0,0 +1 @@
 ["",]
--- a/trustinsoft/fuzz_inputs/0-2125223e99.json
+++ b/trustinsoft/fuzz_inputs/0-2125223e99.json
@@ -0,0 +1 @@
 {]
--- a/trustinsoft/fuzz_inputs/0-2161a4ca5a.json
+++ b/trustinsoft/fuzz_inputs/0-2161a4ca5a.json
@@ -0,0 +1 @@
 ["x",,]
--- a/trustinsoft/fuzz_inputs/0-22f311c530.json
+++ b/trustinsoft/fuzz_inputs/0-22f311c530.json
@@ -0,0 +1 @@
 [１
--- a/trustinsoft/fuzz_inputs/0-2366f354a2.json
+++ b/trustinsoft/fuzz_inputs/0-2366f354a2.json
@@ -0,0 +1 @@
 [""]
--- a/trustinsoft/fuzz_inputs/0-23d6a734a7.json
+++ b/trustinsoft/fuzz_inputs/0-23d6a734a7.json
@@ -0,0 +1 @@
 {999
--- a/trustinsoft/fuzz_inputs/0-245843abef.json
+++ b/trustinsoft/fuzz_inputs/0-245843abef.json
@@ -0,0 +1 @@
 [
--- a/trustinsoft/fuzz_inputs/0-24b9bc232f.json
+++ b/trustinsoft/fuzz_inputs/0-24b9bc232f.json
@@ -0,0 +1 @@
 ["\uDFAA"]
--- a/trustinsoft/fuzz_inputs/0-25981c42fd.json
+++ b/trustinsoft/fuzz_inputs/0-25981c42fd.json
@@ -0,0 +1 @@
 [0e+-1]
--- a/trustinsoft/fuzz_inputs/0-267620ed59.json
+++ b/trustinsoft/fuzz_inputs/0-267620ed59.json
@@ -0,0 +1 @@
 [nul]
--- a/trustinsoft/fuzz_inputs/0-27e0a21606.json
+++ b/trustinsoft/fuzz_inputs/0-27e0a21606.json
@@ -0,0 +1,3 @@
 {
 "a": "b"
 }
--- a/trustinsoft/fuzz_inputs/0-2a43df431a.json
+++ b/trustinsoft/fuzz_inputs/0-2a43df431a.json
@@ -0,0 +1 @@
 [1e-2]
--- a/trustinsoft/fuzz_inputs/0-2b3646f1ef.json
+++ b/trustinsoft/fuzz_inputs/0-2b3646f1ef.json
@@ -0,0 +1 @@
 [,1]
--- a/trustinsoft/fuzz_inputs/0-2c1359e904.json
+++ b/trustinsoft/fuzz_inputs/0-2c1359e904.json
@@ -0,0 +1 @@
 [123.456e-789]
--- a/trustinsoft/fuzz_inputs/0-2d2df3a923.json
+++ b/trustinsoft/fuzz_inputs/0-2d2df3a923.json
@@ -0,0 +1 @@
 {"asd":"sdf", "dfg":"fgh"}
--- a/trustinsoft/fuzz_inputs/0-301f5421cd.json
+++ b/trustinsoft/fuzz_inputs/0-301f5421cd.json
@@ -0,0 +1 @@
 ["x"
--- a/trustinsoft/fuzz_inputs/0-3102771b51.json
+++ b/trustinsoft/fuzz_inputs/0-3102771b51.json
@@ -0,0 +1 @@
 []
--- a/trustinsoft/fuzz_inputs/0-31f674b45f.json
+++ b/trustinsoft/fuzz_inputs/0-31f674b45f.json
@@ -0,0 +1 @@
 [""],
--- a/trustinsoft/fuzz_inputs/0-3246b39a6e.json
+++ b/trustinsoft/fuzz_inputs/0-3246b39a6e.json
@@ -0,0 +1 @@
 [0x4
--- a/trustinsoft/fuzz_inputs/0-335ffac769.json
+++ b/trustinsoft/fuzz_inputs/0-335ffac769.json
@@ -0,0 +1 @@
 ["���"]
--- a/trustinsoft/fuzz_inputs/0-34937db038.json
+++ b/trustinsoft/fuzz_inputs/0-34937db038.json
@@ -0,0 +1 @@
 {"a":"a
--- a/trustinsoft/fuzz_inputs/0-36696d34fc.json
+++ b/trustinsoft/fuzz_inputs/0-36696d34fc.json
@@ -0,0 +1 @@
 [x
--- a/trustinsoft/fuzz_inputs/0-36a9e7f1c9.json
+++ b/trustinsoft/fuzz_inputs/0-36a9e7f1c9.json
@@ -0,0 +1 @@
 
--- a/trustinsoft/fuzz_inputs/0-3726f874bc.json
+++ b/trustinsoft/fuzz_inputs/0-3726f874bc.json
@@ -0,0 +1 @@
 ["a/c/*d//e"]
--- a/trustinsoft/fuzz_inputs/0-379af949f1.json
+++ b/trustinsoft/fuzz_inputs/0-379af949f1.json
@@ -0,0 +1 @@
 [�]
--- a/trustinsoft/fuzz_inputs/0-379c8b8c64.json
+++ b/trustinsoft/fuzz_inputs/0-379c8b8c64.json
@@ -0,0 +1 @@
 [0.e1]
--- a/trustinsoft/fuzz_inputs/0-3861f42f22.json
+++ b/trustinsoft/fuzz_inputs/0-3861f42f22.json
@@ -0,0 +1 @@
 ""x
--- a/trustinsoft/fuzz_inputs/0-39442874d4.json
+++ b/trustinsoft/fuzz_inputs/0-39442874d4.json
@@ -0,0 +1 @@
 ["\å
--- a/trustinsoft/fuzz_inputs/0-3a5b06d8fc.json
+++ b/trustinsoft/fuzz_inputs/0-3a5b06d8fc.json
@@ -0,0 +1 @@
 ["\uD800\u"]
--- a/trustinsoft/fuzz_inputs/0-3c8f12d1d9.json
+++ b/trustinsoft/fuzz_inputs/0-3c8f12d1d9.json
@@ -0,0 +1 @@
 {"\uDFAA":0}
--- a/trustinsoft/fuzz_inputs/0-3d2178302f.json
+++ b/trustinsoft/fuzz_inputs/0-3d2178302f.json
@@ -0,0 +1 @@
 [-Na
--- a/trustinsoft/fuzz_inputs/0-3d8bb2c4e6.json
+++ b/trustinsoft/fuzz_inputs/0-3d8bb2c4e6.json
@@ -0,0 +1 @@
 {"a":"b",,"c"}
--- a/trustinsoft/fuzz_inputs/0-3d90fa020a.json
+++ b/trustinsoft/fuzz_inputs/0-3d90fa020a.json
@@ -0,0 +1 @@
 [1 t
--- a/trustinsoft/fuzz_inputs/0-3db3f981f8.json
+++ b/trustinsoft/fuzz_inputs/0-3db3f981f8.json
@@ -0,0 +1 @@
 ["\uA66D"]
--- a/trustinsoft/fuzz_inputs/0-3f54bdbbd4.json
+++ b/trustinsoft/fuzz_inputs/0-3f54bdbbd4.json
@@ -0,0 +1 @@
 [0e+]
--- a/trustinsoft/fuzz_inputs/0-3f801979da.json
+++ b/trustinsoft/fuzz_inputs/0-3f801979da.json
@@ -0,0 +1 @@
 ο»{}
--- a/trustinsoft/fuzz_inputs/0-4069445221.json
+++ b/trustinsoft/fuzz_inputs/0-4069445221.json
@@ -0,0 +1 @@
 [-0]
--- a/trustinsoft/fuzz_inputs/0-4138c6ae42.json
+++ b/trustinsoft/fuzz_inputs/0-4138c6ae42.json
@@ -0,0 +1 @@
 [1
--- a/trustinsoft/fuzz_inputs/0-440a346596.json
+++ b/trustinsoft/fuzz_inputs/0-440a346596.json
@@ -0,0 +1 @@
 ["\u002c"]
--- a/trustinsoft/fuzz_inputs/0-440ffa21e6.json
+++ b/trustinsoft/fuzz_inputs/0-440ffa21e6.json
@@ -0,0 +1 @@
 [123.456e78]
--- a/trustinsoft/fuzz_inputs/0-44136fa355.json
+++ b/trustinsoft/fuzz_inputs/0-44136fa355.json
@@ -0,0 +1 @@
 {}
--- a/trustinsoft/fuzz_inputs/0-456e2e3fa0.json
+++ b/trustinsoft/fuzz_inputs/0-456e2e3fa0.json
@@ -0,0 +1 @@
 [false]
--- a/trustinsoft/fuzz_inputs/0-457db13b27.json
+++ b/trustinsoft/fuzz_inputs/0-457db13b27.json
@@ -0,0 +1 @@
 [-23279832749832423479823246327846]
--- a/trustinsoft/fuzz_inputs/0-46d28bfddb.json
+++ b/trustinsoft/fuzz_inputs/0-46d28bfddb.json
@@ -0,0 +1 @@
 [0.1.2]
--- a/trustinsoft/fuzz_inputs/0-4735d351ed.json
+++ b/trustinsoft/fuzz_inputs/0-4735d351ed.json
@@ -0,0 +1 @@
 [-Infinity]
--- a/trustinsoft/fuzz_inputs/0-48098add03.json
+++ b/trustinsoft/fuzz_inputs/0-48098add03.json
@@ -0,0 +1 @@
 [\u0
--- a/trustinsoft/fuzz_inputs/0-487520c173.json
+++ b/trustinsoft/fuzz_inputs/0-487520c173.json
@@ -0,0 +1 @@
 [1E22]
--- a/trustinsoft/fuzz_inputs/0-489276424d.json
+++ b/trustinsoft/fuzz_inputs/0-489276424d.json
@@ -0,0 +1 @@
 ["\x
--- a/trustinsoft/fuzz_inputs/0-491486ca08.json
+++ b/trustinsoft/fuzz_inputs/0-491486ca08.json
@@ -0,0 +1 @@
 [1eE