Commit Graph

  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • |\
  • | *
  • |/
  • *
  • |\
  • | *
  • |/
  • *
  • |\
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • |/
  • *
  • *
  • | *
  • |/
  • | *
  • | |\
  • * | \
  • |\ \ \
  • | | * |
  • | |/ /
  • |/| |
  • | * |
  • |/ /
  • | | *
  • | |/|
  • |/| |
  • * | |
  • * | |
  • * | |
  • |\ \ \
  • * | | |
  • | | | | *
  • | | | | |\
  • | | | | | | *
  • | | | | | | |\
  • | | | | | | | | *
  • | | | | | | | | |\
  • | | | | | | | | | | *
  • | | | | | | | | | | *
  • | | | | | | | | | | *
  • | |_|_|_|_|_|_|_|_|/
  • |/| | | | | | | | |
  • * | | | | | | | | |
  • * | | | | | | | | |
  • |\ \ \ \ \ \ \ \ \ \
  • | * | | | | | | | | |
  • |/ / / / / / / / / /
  • * | | | | | | | | |
  • | | | * | | | | | |
  • | |_|/ / / / / / /
  • |/| | | | | | | |
  • * | | | | | | | |
  • * | | | | | | | |
  • |\ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \
  • | | | * | | | | | | | |
  • | |_|/ / / / / / / / /
  • |/| | | | | | | | | |
  • | | * | | | | | | | |
  • | |/ / / / / / / / /
  • |/| | | | | | | | |
  • | * | | | | | | | |
  • |/ / / / / / / / /
  • * | | | | | | | |
  • |\ \ \ \ \ \ \ \ \
  • | * | | | | | | | |
  • | * | | | | | | | |
  • |/ / / / / / / / /
  • | | | | | | | | | *
  • | |_|_|_|_|_|_|_|/
  • |/| | | | | | | |
  • * | | | | | | | |
  • * | | | | | | | |
  • * | | | | | | | |
  • * | | | | | | | |
  • * | | | | | | | |
  • |\ \ \ \ \ \ \ \ \
  • | * | | | | | | | |
  • |/ / / / / / / / /
  • | | | | | | | | | *
  • | | | | | | | | | *
  • | | | | | | | | | *
  • | |_|_|_|_|_|_|_|/
  • |/| | | | | | | |
  • | | | | | | | | | *
  • * | | | | | | | | |
  • |\ \ \ \ \ \ \ \ \ \
  • | * | | | | | | | | |
  • |/ / / / / / / / / /
  • * | | | | | | | | |
  • |\ \ \ \ \ \ \ \ \ \
  • | * | | | | | | | | |
  • | * | | | | | | | | |
  • | * | | | | | | | | |
  • |/ / / / / / / / / /
  • * | | | | | | | | |
  • |\ \ \ \ \ \ \ \ \ \
  • | * | | | | | | | | |
  • |/ / / / / / / / / /
  • * | | | | | | | | |
  • | | | | | | | | | | *
  • | |_|_|_|_|_|_|_|_|/|
  • |/| | | | | | | | | |
  • * | | | | | | | | | |
  • |\ \ \ \ \ \ \ \ \ \ \
  • * | | | | | | | | | | |
  • * | | | | | | | | | | |
  • * | | | | | | | | | | |
  • * | | | | | | | | | | |
  • * | | | | | | | | | | |
  • * | | | | | | | | | | |
  • * | | | | | | | | | | |
  • * | | | | | | | | | | |
  • |\ \ \ \ \ \ \ \ \ \ \ \
  • | * | | | | | | | | | | |
  • |/ / / / / / / / / / / /
  • | | | | | | | | | | | | *
  • | |_|_|_|_|_|_|_|_|_|_|/
  • |/| | | | | | | | | | |
  • | | | | | | | | | | | | *
  • | |_|_|_|_|_|_|_|_|_|_|/
  • |/| | | | | | | | | | |
  • * | | | | | | | | | | |
  • * | | | | | | | | | | |
  • |\ \ \ \ \ \ \ \ \ \ \ \
  • | * | | | | | | | | | | |
  • |/ / / / / / / / / / / /
  • * | | | | | | | | | | |
  • * | | | | | | | | | | |
  • |\ \ \ \ \ \ \ \ \ \ \ \
  • | | | | | | | | | | | | | *
  • | |_|_|_|_|_|_|_|_|_|_|_|/
  • |/| | | | | | | | | | | |
  • | * | | | | | | | | | | |
  • |/ / / / / / / / / / / /
  • * | | | | | | | | | | |
  • 12ea386 Add an abi-check.sh script that shows how to run the abi-compliance-checker, update release creation steps slightly. by Eric Hawicz 2023-08-12 14:34:35 -0400
  • 6dd8618 Also fix messages returned from json_tokener_error_desc() (broke due to the ordering change of enum json_tokener_error) by Eric Haszlakiewicz 2023-08-12 18:52:32 +0000
  • 3dad694 Move the json_tokener_error_memory entry to the end of enum json_tokener_error to restore binary compatibility with 0.16 by Eric Hawicz 2023-08-12 13:54:50 -0400
  • f7e9d8e Update the AUTHORS file and add issues_closed_for_0.17.md for the upcoming 0.17 release by Eric Hawicz 2023-08-12 13:53:27 -0400
  • 85ed501 Update the ChangeLog for 0.17 based on notable commits since 0.16 by Eric Hawicz 2023-08-08 17:31:38 -0400
  • 077661f Fix issue #823: add back json_number_chars, but only because it's part of the public API. by Eric Hawicz 2023-08-06 15:35:04 -0400
  • 87127d3 Merge pull request #679 from GitMensch/patch-1 by Eric Hawicz 2023-08-05 22:32:37 -0400
  • 1ee1210 (refs/pull/679/head) PR #679: add workaround for old compilers w/o stdint.h (i.e. VS2008 and earlier) by Eric Hawicz 2023-08-05 22:11:30 -0400
  • 0bcfb6b Merge pull request #822 from SSharshunov/master by Eric Hawicz 2023-08-04 11:47:23 -0400
  • bef40a3 (refs/pull/822/head) Added option to disable app build by Sergey Sharshunov 2023-08-04 19:46:50 +0500
  • 2316dba Merge pull request #702 from commodo/json_patch by Eric Hawicz 2023-07-31 22:19:30 -0400
  • 612ba56 (refs/pull/702/head) Don't export json_pointer_get_internal, move json_object_array_insert_idx and json_patch_apply to the JSONC_0.17 section in json-c.sym by Eric Hawicz 2023-07-29 21:45:16 -0400
  • 469bc0e Work around a somewhat misleading warning about "a function declaration without a prototype is deprecated in all versions of C" in test1.c by Eric Hawicz 2023-07-29 11:22:12 -0400
  • ce31842 Fix json_patch_apply handling of removing the whole document (i.e. "path":""). Enable all disabled tests, add a few more including some with null documents. by Eric Hawicz 2023-07-28 22:12:51 -0400
  • 9dbf288 Adjust the behavior of the args passed to json_patch_apply to make it easier to do in place modifications, and add a struct json_patch_error to report more details on failures. by Eric Hawicz 2023-07-26 22:01:04 -0400
  • a14a3a6 Fix an uninitialized memory access in json_pointer. Add comments describing when the fields of the internal struct json_pointer_get_result are valid. by Eric Hawicz 2023-07-26 18:15:07 -0400
  • efc5305 Create a json_pointer_private.h and move a few things there, fix test warnings, note array_list_insert_idx is private. by Eric Hawicz 2023-07-16 10:48:20 -0400
  • 3b8363f tests: test_json_patch: add test suite for JSON patch by Alexandru Ardelean 2021-04-20 15:47:18 +0300
  • 538b046 json_patch: add first implementation only with patch application by Alexandru Ardelean 2021-04-24 17:00:13 +0300
  • e4d9fbd json_pointer: split json_pointer_set_with_array_cb() by Alexandru Ardelean 2021-04-23 21:56:29 +0300
  • 1c38dea json_pointer: move array out-of-bounds check outside of is_valid_index() by Alexandru Ardelean 2021-04-23 21:19:49 +0300
  • 5a46a3b json_pointer: introduce json_pointer_get_internal() for internal usage by Alexandru Ardelean 2021-04-20 16:23:47 +0300
  • 43d3118 json_pointer: convert index to size_t type by Alexandru Ardelean 2021-04-24 17:06:17 +0300
  • d5c5b2c tests: test1: add test cases for json_object_array_insert_idx() by Alexandru Ardelean 2021-04-20 16:07:26 +0300
  • a86d7a8 json_object: introduce json_object_array_insert_idx() API function by Alexandru Ardelean 2021-04-16 16:12:22 +0300
  • 5568916 json_pointer: fix comments about printf() variants of set/get() by Alexandru Ardelean 2021-04-22 11:19:07 +0300
  • 71d845e Issue #668: add the option to specify "cmake -DUSELOCALE_NEEDS_FREELOCALE=1" to work around a bug in older versions of FreeBSD (<12.4). by Eric Hawicz 2023-07-30 13:38:15 -0400
  • c8b0a90 Issue #808: turn off -Wshorten-64-to-32 for clang builds (aka iOS builds) to workaround "implicit conversion loses integer precision" warnings. by Eric Hawicz 2023-07-30 11:38:01 -0400
  • fa7308b (issue808-ios-build) Run travis builds using iOS flags, to attempt to reproduce Issue #808. by Eric Hawicz 2023-07-30 10:23:21 -0400
  • b9b01ef Merge branch 'elear-master' into feature-krishna-new_upstream by krishna-elear 2023-07-29 00:37:24 +0530
  • 9b36c72 Merge pull request #772 from cosmo-ray/color by Eric Hawicz 2023-07-13 18:04:48 -0400
  • 57388e2 Add conanfile.py by krishna-elear 2023-07-13 03:42:42 +0530
  • 9803032 (refs/pull/772/head) add JSON_C_TO_STRING_COLOR option by Matthias Gatto 2022-06-02 17:10:21 +0200
  • 392af17 (refs/pull/805/merge) Merge 5d1f857ded into bdfdb5fe10 by dbrouwer 2023-07-07 12:40:34 +0800
  • bdfdb5f Skip apps when we're included in someone else's build. Inspired by ssrlive in PR #813. by Eric Hawicz 2023-07-06 20:56:49 -0400
  • 11311ed Fix the -f option to apps/json_parse, add a -F <arg> option to specify arbitrary flags to pass to json_object_to_json_string_ext(). by Eric Hawicz 2023-07-04 12:00:31 -0400
  • e9d3ab2 Merge pull request #759 from c3h2-ctf/truncation by Eric Hawicz 2023-07-04 11:45:57 -0400
  • 4d529f9 Issue #688: Only exclude generated doc/* files, keep the CMakeLists.txt, etc... so the nodoc tarball can still be built. by Eric Haszlakiewicz 2023-07-01 18:02:00 +0000
  • aadde42 (json-c-0.13) Merge pull request #625 from besser82/topic/besser82/json-c-0.13/rdrand_fixes by Eric Hawicz 2023-06-28 18:01:58 -0400
  • 5a310ba (json-c-0.14) Merge pull request #624 from besser82/topic/besser82/json-c-0.14/rdrand_fixes by Eric Hawicz 2023-06-28 18:01:39 -0400
  • 188d1e3 (json-c-0.11) Merge pull request #612 from besser82/topic/besser82/json-c-0.11/CVE-2020-12762 by Eric Hawicz 2023-06-28 17:50:55 -0400
  • 9f469dd (refs/pull/813/head) Update CMakeLists.txt by ssrlive 2023-04-13 07:45:18 +0800
  • 5a9a2e8 Add flags for other users by ssrlive 2023-04-12 20:28:28 +0800
  • d4c9ac2 Build apps only in project itself. by ssrlive 2023-04-12 20:21:51 +0800
  • d0f32a5 Stop linking a copy of _json_c_strerror() (strerror_override.c) into the tests. That hasn't been needed since since commit 6068d3f, which changed that code to check an env var instead ("_JSON_C_STRERROR_ENABLE"). Fixes issue #812, about dup symbols in static builds with clang. by Eric Haszlakiewicz 2023-03-28 23:08:39 +0000
  • efd536a Merge pull request #810 from dijonkitchen/patch-1 by Eric Hawicz 2023-03-10 14:54:44 -0500
  • 4d5507f (refs/pull/810/head) docs: update to Internet Standard reference by JC (Jonathan Chen) 2023-03-10 11:10:29 -0500
  • d1716fe Bump up the minimum cmake version to 3.9. This gets us up to a version that supports features we're already using (i.e. add_compile_options), but stops short of a cmake that requires c++11, which some OSes still don't support. Closes issue #774 by Eric Haszlakiewicz 2023-02-23 01:01:14 +0000
  • 5d1f857 (refs/pull/805/head) Add JSON_C_TO_STRING_PRETTY_COMPACT_ARRAY. by Deborah Brouwer 2023-01-05 22:13:38 -0800
  • 1741bcd Issue #570: note brief instructions for building on Android. by Eric Haszlakiewicz 2023-01-05 00:25:09 +0000
  • 343f24f Merge pull request #804 from yrashk/cmp-0042 by Eric Hawicz 2022-12-27 09:32:33 -0500
  • 6ec5e58 Merge pull request #803 from yrashk/patch-2 by Eric Hawicz 2022-12-27 09:26:30 -0500
  • b6ba942 Merge pull request #802 from yrashk/patch-1 by Eric Hawicz 2022-12-27 09:25:58 -0500
  • 3cc0c47 (refs/pull/804/head) Problem: cmake 3.25.1 warns about CMP0042 not being set by Yurii Rashkovskii 2022-12-23 14:59:59 -0800
  • 7b971b5 (refs/pull/803/head) Problem: confusing error message in snprintf_compat.h by Yurii Rashkovskii 2022-12-23 14:35:36 -0800
  • debe8b7 (refs/pull/802/head) Problem: modern CMake warns about version 2.8 by Yurii Rashkovskii 2022-12-23 14:33:31 -0800
  • 79c1472 Merge pull request #796 from fedefrancescon/test-add-int-get by Eric Hawicz 2022-11-16 22:23:11 -0500
  • 1a2fdc4 (refs/pull/796/head) Fixed `test_int_get` expected output by Federico Francescon 2022-11-16 01:33:02 +0100
  • b1fb150 Added basic tests for `json_object_get_int`, `json_object_get_int64`, `json_object_get_uint64` by Federico Francescon 2022-11-16 00:49:18 +0100
  • 758c91d (refs/pull/794/head) replaced by Stabbar 2022-11-08 23:49:39 +0300
  • bc35549 Update expected output for test_parse, missed in the previous commit. by Eric Haszlakiewicz 2022-10-30 19:42:42 +0000
  • d6f46ae Explicitly check for integer overflow/underflow when parsing integers with JSON_TOKENER_STRICT. by Eric Haszlakiewicz 2022-10-30 19:29:15 +0000
  • c50bf9d Apply same EINVAL handling to json_parse_uint64() as was done for json_parse_int64(). Document that overflow/underflow for these functions is not an error, but sets errno=ERANGE. by Eric Haszlakiewicz 2022-10-30 03:25:32 +0000
  • 57bef5e Issue #792 - set errno=EINVAL if parsing the string in json_parse_int64 fails, to match the docs for json_object_get_int. by Eric Haszlakiewicz 2022-10-26 02:19:38 +0000
  • 777dd06 Merge pull request #790 from Sarcares/patch-1 by Eric Hawicz 2022-09-13 22:15:48 -0400
  • 84248a7 (refs/pull/790/head) Small update to README file by Luca Mannella 2022-09-12 17:29:47 +0200
  • c8b7e11 (refs/pull/789/head) Unsafe function usage by Eibz-Chan 2022-09-08 19:28:21 +0800
  • 15ddc4a Unsafe function usage. by Eibz-Chan 2022-09-08 18:54:03 +0800
  • 9f82fd9 Unnecessary struct 'json_object' declaration by Eibz-Chan 2022-09-08 18:34:08 +0800
  • aff2b83 Note that the current release is 0.16 by Eric Haszlakiewicz 2022-08-26 23:29:44 +0000
  • 81f0807 Merge pull request #784 from rouault/get_time_seed_coverity_scan_silence by Eric Hawicz 2022-08-16 18:10:06 -0400
  • 57ea393 (refs/pull/784/head) get_time_seed(): silence warning emitted by Coverity Scan static analyzer by Even Rouault 2022-08-16 11:11:55 +0200
  • 9417f4e Merge pull request #783 from kraj/master by Eric Hawicz 2022-08-14 08:19:19 -0400
  • 257b29c (refs/pull/783/head) json_pointer.c: Move idx_val declaration to top of function by Khem Raj 2022-08-14 00:46:28 -0700
  • d1deed4 json_inttypes.h: Define ssize_t on windows platforms by Khem Raj 2022-08-13 21:45:11 -0700
  • 6eca656 Fix build with clang-15+ by Khem Raj 2022-08-13 20:37:03 -0700
  • ac4dfa4 Merge pull request #782 from DimitriPapadopoulos/codespell by Eric Hawicz 2022-08-13 09:43:50 -0400
  • 9462c0a (refs/pull/782/head) Fix typos found by codespell by Dimitri Papadopoulos 2022-08-13 15:47:40 +0300
  • bdd5e03 Apply some of the fixes from PR #740, although by using size_t instead of castings. by Eric Haszlakiewicz 2022-07-31 19:26:12 +0000
  • a54407b (refs/pull/740/merge) Merge a406ec983d into 4b0c6de760 by Even Rouault 2022-07-31 14:30:32 -0400
  • 4b0c6de Merge pull request #757 from c3h2-ctf/big by Eric Hawicz 2022-07-31 14:27:32 -0400
  • 253a5fa Issue #705: disable locale handling when building for a uClibc system because its duplocale() function (intentionally) crashes. by Eric Haszlakiewicz 2022-07-30 20:27:35 +0000
  • 9749b0c When serializing with JSON_C_TO_STRING_PRETTY set, keep the opening and closing curly or square braces on same line for empty objects or arrays. Issue #778. by Eric Haszlakiewicz 2022-07-30 19:27:14 +0000
  • 2e9b745 Update Travis links to point at travis-ci.com instead of travis-ci.org by Eric Haszlakiewicz 2022-07-26 23:47:58 +0000
  • 5282e73 Entirely drop mode bits from open(O_RDONLY) to avoid warnings on certain platforms. Fixes issue #779. by Eric Haszlakiewicz 2022-07-26 23:43:30 +0000
  • 8b35a78 Trim a few travis builds, update others to more recent toolchains. by Eric Haszlakiewicz 2022-07-24 20:37:14 +0000
  • 22773b1 Fix the expected output for test_set_serializer. by Eric Haszlakiewicz 2022-07-24 19:00:27 +0000
  • 16208fc Add test to check for the memory leak mentioned in issue #781 by Eric Haszlakiewicz 2022-07-24 18:59:26 +0000
  • 2a2d861 Merge pull request #781 from dddaniel/master by Eric Hawicz 2022-07-24 14:15:42 -0400
  • 213bb5c (refs/pull/781/head) Fix memory leak with emtpy strings in json_object_set_string by Daniel Danzberger 2022-07-24 18:46:03 +0200
  • b9cbd44 (refs/pull/779/head) Fix compiling for Android by Matthias Kuhn 2022-07-12 21:15:06 +0200
  • ab555a2 (refs/pull/777/head) Don't try to change locale when libc only supports the C locale by James Hilliard 2022-07-04 03:05:26 -0600
  • d28ac67 Fix issue #775 - use a loop instead of list(TRANSFORM ...) to support cmake < 3.12. by Eric Haszlakiewicz 2022-06-27 02:15:24 +0000
  • 5d98f78 Merge pull request #776 from stoeckmann/typo by Eric Hawicz 2022-06-21 21:39:00 -0400
  • f635734 (refs/pull/776/head) Fix typo by Tobias Stoeckmann 2022-06-21 14:39:01 +0200
  • 6ee0a35 Fix #771/#768 by marking usage() as "noreturn" instead of using "FALLTHRU" in the case statement where it'd called. by Eric Haszlakiewicz 2022-06-13 01:02:53 +0000
  • 11546bf Merge pull request #769 from An7ar35/issue-768 by Eric Hawicz 2022-06-03 23:14:16 -0400
  • 3e8b16f (refs/pull/771/head) fix fallthough warning by Matthias Gatto 2022-06-02 17:09:57 +0200
  • 5d00384 (refs/pull/769/head) missing 'FALLTHRU' added to sort out error messages when using "-Werror=implicit-fallthrough" flag by An7ar35 2022-06-01 12:36:33 +0200
  • 49c3721 Unset NDEBUG so assert() is enabled in all tests. One more fix there when building with -DCMAKE_BUILD_TYPE=release. by Eric Haszlakiewicz 2022-05-30 15:39:54 +0000