Commit Graph
-
632c9f4(refs/pull/640/head) Fix build issues with SSIZE_MAX on 64bit Linux by 2020-06-30 14:22:12 +0100 -
34334e5Replace one call to json_object_new_array() with json_object_new_array_ext() to ensure it at least minimally works. by 2020-06-29 02:35:26 +0000 -
0b67caeAdd doc comment for json_object_new_array_ext(). by 2020-06-29 02:31:32 +0000 -
a4e3700Fix code formatting by 2020-06-29 02:31:18 +0000 -
5f3bf70Make sure TEST_PARSE_CHUNKSIZE is valid if it's set. by 2020-06-29 02:18:34 +0000 -
f23486aIn the json_tokener_state_number case, explicitly adjust what "number" characters are allowed based on the exact micro-state that we're in, and check for invalid following characters in a different way, to allow a valid json_type_number object to be returned at the top level. This causes previously failing strings like "123-456" to return a valid json_object with the appropriate value. If you care about the trailing content, call json_tokener_parse_ex() and check the parse end point with json_tokener_get_parse_end(). by 2020-06-29 02:14:26 +0000 -
6eac698Fix incremental parsing of invalid numbers with exponents, such as "0e+-" and "12.3E12E12", while still allowing "0e+" in non-strict mode. Deprecate the json_parse_double() function from json_util.h by 2020-06-27 15:32:19 +0000 -
84e6032Issue #635: Fix "expression has no effect" warning in json_tokener.c by casting to void. by 2020-06-23 02:51:46 +0000 -
7a72805Fix memory leak in test_parse's single_incremental_parse(). by 2020-06-22 01:12:03 +0000 -
7d3c2d9Drop extra blank lines from arraylist.h by 2020-06-21 18:30:40 +0000 -
a68566bIssue #616: Change the parsing of surrogate pairs in unicode escapes so it uses a couple of additional states instead of assuming the low surrogate is already present, to ensure that we correctly handle various cases of incremental parsing. by 2020-06-21 18:17:40 +0000 -
197e372In test_parse, fix lengths passed during a couple of incremental tests. Add an optional way to use an incremental chunk size ($TEST_PARSE_CHUNKSIZE) for all of the single_basic_parse tests, in additional to the regular way. by 2020-06-21 17:36:38 +0000 -
36118b6Rearrange the json_tokener_state_escape_unicode case in json_tokener to simplify the code slightly and make it a bit easier to understand. While here, drop the utf8_replacement_char that is unnecesarily added if we run out of input in the middle of a unicode escape. No other functional changes (yet). by 2020-06-21 03:10:55 +0000 -
50179fbUpdate the json_tokener_parse_ex() docs to clarify that the final '\0' character is to be included in length passed in. by 2020-06-21 02:35:42 +0000 -
da76ee2Merge pull request #633 from dota17/issue616 by 2020-06-20 22:33:17 -0400 -
e26a119Add json_object_array_shrink() (and array_list_shrink()) and use it in json_tokener to minimize the amount of memory used. This results in a 39%-50% reduction in memory use (peak RSS, peak heap usage) on the jc-bench benchmark and 9% shorter runtime. Also add the json_object_new_array_ext, array_list_new2, and array_list_shrink functions. by 2020-06-20 18:03:04 +0000 -
99bb212Merge pull request #632 from json-c/json_object-split by 2020-06-20 13:04:32 -0400 -
0710c83(refs/pull/632/head, json_object-split) Reformat the json_object-split branch with clang-format by 2020-06-16 13:17:58 +0000 -
401b29cMerge pull request #634 from micahsnyder/json-c-fPIC by 2020-06-14 17:56:35 -0400 -
6049468(refs/pull/634/head) Issue #508: `-fPIC` to link libjson-c.a with libs by 2020-06-14 12:01:48 -0400 -
9128ec4Include unistd.h to fix the build on OSX by 2020-06-14 03:11:44 +0000 -
5ebfeaeDrop the _delete field from struct json_object and call the type-specific delete functions directly from json_object_put. (Thanks @dota17 for the suggestion in PR #632!) by 2020-06-13 18:34:35 +0000 -
4c10712Drop the useless "char data[1]" from struct json_object. Fix a typo in a comment. by 2020-06-13 18:25:32 +0000 -
c1b872d(refs/pull/633/head) fix issue 616: support the surrogate pair in split file. by 2020-06-02 19:17:42 +0800 -
85c244fEliminate unnecessary cast that was added to test_double_serializer. by 2020-06-07 18:50:10 +0000 -
02fe2e0Summarize the changes from the json_object-split branch in the ChangeLog. by 2020-06-07 18:45:17 +0000 -
ecdfeb1Move the ssize_t typedef from json_inttypes.h to json_object_private.h so as not to affect publically exposed symbols. by 2020-06-07 18:29:56 +0000 -
66d91fdThe split of json_object into type-specific sub-structures is now functionally complete. Remove all of the temporary defines, structures, old compat fuctions, extra fields, etc... that were needed during the conversion to a split set of json_object_* structures. by 2020-06-07 03:30:39 +0000 -
c4cc673More fixes for old MSVC builds. by 2020-06-07 15:25:59 +0000 -
0a16b23Fix typo in previous commit to check for SSIZE_T on MSVC. by 2020-06-07 15:19:29 +0000 -
eab1375Change CMakeLists.txt to look for SSIZE_T on MSVC too. by 2020-06-07 03:36:59 +0000 -
b0466b6On MSVC, add a ssize_t typedef using SSIZE_T from BaseTsd.h by 2020-06-07 03:27:13 +0000 -
0fc9d91Kick json_type_string out of struct json_object. The default is now that string data is stored inline at the end of json_object, though to allow for json_object_set_string() to set a _longer_ string, we still need to allow for the possibility of a separate char * pointer. All json types have been split out now, next step it cleanup. by 2020-06-07 02:42:58 +0000 -
bc06f82Merge pull request #628 from clamwin/compat-fixes-master by 2020-06-03 23:53:46 -0400 -
67e08a1(refs/pull/629/head) Remove the Visual Studio project file by 2020-06-03 09:55:27 +0200 -
481d0a8(refs/pull/628/head) get_cryptgenrandom_seed: compat with old windows + fallback by 2020-06-01 20:49:08 +0200 -
ee9f67cIssue #626: Restore compatibility with cmake 2.8 by explicitly defining the PROJECT_VERSION* variables. by 2020-05-30 19:36:54 +0000 -
5bb5842(refs/pull/627/head) get_cryptgenrandom_seed: compat with old windows + fallback by 2020-06-01 20:49:08 +0200 -
a731ae6(refs/pull/625/head) Detect broken RDRAND during initialization. by 2020-05-25 13:01:18 +0200 -
a8899be(refs/pull/626/head) Merge branch 'json-c-0.13' into json-c-0.13 by 2020-06-01 19:56:14 +1200 -
cc5c434Apply the fix from @pointbre in issue #626 to skip "inline" on AIX, but invert the test to make it a little easier to understand. by 2020-05-31 03:22:14 +0000 -
1c6086aApply the fix from @pointbre in issue #626 to skip "inline" on AIX, but invert the test to make it a little easier to understand. by 2020-05-31 03:22:14 +0000 -
fe308b8Issue #626: Restore compatibility with cmake 2.8 by adjusting quoting and explicitly defining the PROJECT_VERSION* variables. by 2020-05-30 19:36:54 +0000 -
4153f5aFixed version issue for cmake 2.8 by 2020-05-29 16:06:41 +1200 -
89b278aFixed version issue for cmake 2.8 by 2020-05-29 16:03:49 +1200 -
ce73fdbChanged version configurations just for cmake < 3 by 2020-05-29 15:01:10 +1200 -
11b9a97Update linkhash.h to fix bug by 2020-05-29 08:13:57 +1200 -
fbee2e5Update CMakeLists.txt by 2020-05-29 07:48:25 +1200 -
a11d947Build issue on AIX 6.1 and cc V11.1 by 2020-05-28 14:47:49 +1200 -
fb67ceaFixes for cmake 2.8.12 by 2020-05-28 14:25:06 +1200 -
9ecb122Kick json_type_int and json_type_double out of struct json_object. Clean up the code in json_object_new_* a bit by dropping unnecesary json_object_base variables. by 2020-05-26 02:31:35 +0000 -
eec4df6(refs/pull/624/head) Detect broken RDRAND during initialization. by 2020-05-25 13:03:31 +0200 -
0351bb5Declare variables earlier, to appease Visual Studio 2010. by 2020-05-25 04:10:11 +0000 -
d1f83bfKick json_type_boolean out of struct json_object. by 2020-05-25 04:04:02 +0000 -
5d89fc8Add some backwards compat for Visual Studio 2013. by 2020-05-25 03:52:36 +0000 -
02b687bKick json_type_array out of struct json_object; re-enable the test_deep_copy test. by 2020-05-25 03:44:56 +0000 -
853b4b5Start splitting struct json_object into multiple sub-types, as descibed at https://github.com/json-c/json-c/wiki/Proposal:-struct-json_object-split The current changes split out _only_ json_type_object, and thus have a number of hacks to allow the code to continue to build and work. by 2020-05-25 03:14:06 +0000 -
4a546e7In arraylist, use malloc instead of calloc, avoid clearing with memeset until we really need to, and micro-optimize array_list_add(). by 2020-05-24 03:53:32 +0000 -
fbe1543Merge pull request #622 from besser82/topic/besser82/doc_subdir by 2020-05-18 15:30:21 -0400 -
1e94da7(refs/pull/622/head) CMake: Fix grammar: written -> wrote. by 2020-05-18 20:36:05 +0200 -
61e2baedoc: Move Doxyfile into doc subdir by 2020-05-18 20:32:35 +0200 -
0e43aab(refs/pull/620/head) test_string_noalloc: New test for json_object_new_string_noalloc(). by 2020-05-18 17:17:20 +0200 -
df603c2json_object: Introduce json_object_new_string_noalloc() by 2020-05-18 15:25:56 +0200 -
88c573djson_object: Introduce json_object_new_string_ext(). by 2020-05-18 15:20:19 +0200 -
fa6a7dcWith the change in cc80203, Doxyfile no longer needs to be updated for a release. by 2020-05-18 17:31:22 +0000 -
cc80203Merge pull request #619 from besser82/topic/besser82/doxygen_oot by 2020-05-18 13:30:13 -0400 -
12b2e11Merge pull request #618 from besser82/topic/besser82/test_deep_copy by 2020-05-18 13:29:21 -0400 -
8f3592b(refs/pull/619/head) CMake: Fix out-of-tree build for Doxygen documentation. by 2020-05-18 18:20:01 +0200 -
3008401(refs/pull/618/head) test_deep_copy: Fix assertion value. by 2020-05-18 17:00:17 +0200 -
a8a0590Merge pull request #617 from besser82/topic/besser82/option_disable_tls by 2020-05-18 10:25:54 -0400 -
a85d239(refs/pull/617/head) README: Update configuration options for CMake. by 2020-05-18 12:39:38 +0200 -
76dd99aCMake: Re-format config-option block and re-order it alphabetically. by 2020-05-18 12:26:47 +0200 -
78642dcCMake: Add an option to disable the use of thread-local storage. by 2020-05-18 11:38:58 +0200 -
dd040batests: Fix test_double_serializer without thread-local storage. by 2020-05-18 11:38:36 +0200 -
5b15c75Merge pull request #614 from stoeckmann/format by 2020-05-16 21:04:11 -0400 -
311c5e5Update issue templates by 2020-05-16 20:55:20 -0400 -
5385a56(refs/pull/614/head) Prevent truncation on custom double formatters. by 2020-05-16 13:01:10 +0200 -
9d280b7(refs/pull/613/head) Fix CVE-2020-12762. by 2020-05-15 20:38:40 +0200 -
0a3d22bRevert part of PR#606 and use isnan/isinf again, but provide macro implementations of those in math_compat.h is needed, as it seems to be on AIX and IBM i systems. by 2020-05-16 01:29:18 +0000 -
1526c84Merge pull request #606 from davidjmccann/master by 2020-05-15 21:15:18 -0400 -
f2b7d0b(json-c-0.12) Merge pull request #611 from besser82/topic/besser82/json-c-0.12/CVE-2020-12762 by 2020-05-15 21:05:30 -0400 -
4467e94Merge pull request #608 from besser82/topic/besser82/json-c-0.14/CVE-2020-12762 by 2020-05-15 21:02:37 -0400 -
d706c0b(refs/pull/612/head) Fix CVE-2020-12762. by 2020-05-15 20:38:40 +0200 -
74accb1(refs/pull/611/head) Fix CVE-2020-12762. by 2020-05-15 20:38:40 +0200 -
1faf415(refs/pull/610/head) let's not call lh_table_resize with INT_MAX by 2020-05-15 11:11:36 -0400 -
5d6fa33(refs/pull/608/head) Fix CVE-2020-12762. by 2020-05-14 12:32:30 +0200 -
cf95e99(refs/pull/609/head) use unsigned types for sizes in lh_table and entries by 2020-05-14 19:31:43 -0700 -
86ac554Merge pull request #607 from besser82/topic/besser82/json-c-0.13/CVE-2020-12762 by 2020-05-14 11:23:40 -0400 -
add7b13(refs/pull/606/head) Improved support for IBM operating systems by 2020-05-13 15:57:54 +0100 -
865b5a6(refs/pull/607/head) Fix CVE-2020-12762. by 2020-05-14 12:32:30 +0200 -
d414d3eIssue #604: add check for __MINGW32__ in snprintf_compat.h by 2020-05-13 14:53:05 +0000 -
2e71fe0Display a bit of info about what exactly we're benchmarking. by 2020-05-11 03:03:43 +0000 -
199c52eIgnore the bench/work and bench/data directories. by 2020-05-11 01:24:46 +0000 -
3648c3eMerge pull request #602 from ploxiln/parse_uint64_errno by 2020-05-10 21:15:47 -0400 -
c7c7d1c(refs/pull/603/head) Fix snprintf on windows problem for test4. by 2020-05-10 04:04:28 +0000 -
f0bbaecIssue #600: don't rename the static library on Windows, it _needs_ to have a different name because the dll build also creates a "json-c.lib" file. by 2020-05-10 03:58:51 +0000 -
5d3466dRe-format after recent change to fix linkhash. by 2020-05-10 03:58:27 +0000 -
b4c0c8dIssue #598: avoid building static libraries twice. by 2020-05-10 03:48:45 +0000 -
7a4807fIssue #599: Fix the backwards check in lh_table_insert_w_hash() that was preventing adding more than 11 objects. Add a test to check for this too. by 2020-05-10 03:32:19 +0000 -
2db5633cmake-configure: fix enable-static option by 2020-05-08 02:27:06 +0300