mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-09-07 08:36:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,473 Commits 16 Branches 12 Tags
27bf6592043dec8d237f830f20e2ed515d1cadd6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Hawicz 27bf659204 Merge the two meson checks for arc4random, instead have the has_function loop check first without, then with the dependencies. 2026-08-15 10:58:04 -04:00
Eric Hawicz 1bd2e4b3ef Merge pull request #949 from dxbjavid/pointer-empty-index-token 
reject empty reference token as array index in json_pointer
 2026-07-21 19:45:12 -04:00
Eric Hawicz 1e39345938 Merge pull request #946 from dxbjavid/patch-null-field-fields 
reject null op/path/from fields in json_patch_apply
 2026-07-18 13:15:09 -04:00
Eric Hawicz 0ea5f6c615 Merge pull request #942 from dxbjavid/strerror-negative-oob 
fix out-of-bounds read for negative errno in _json_c_strerror
 2026-07-16 00:42:42 -04:00
Eric Hawicz f61e612b43 Merge pull request #943 from Seagate/meson_install_fix 
fix installing json-c headers with meson and missing pkgconfig file
 2026-07-16 00:41:29 -04:00
Eric Hawicz dfd37bc1bb Merge pull request #945 from arr2036/json-object-put-return-value 
fix json_object_put() to return 1 for freed scalars and empty containers
 2026-07-16 00:40:55 -04:00
Eric Hawicz e65444a258 Merge pull request #940 from dxbjavid/get-int64-double-boundary 
reject out-of-range double in json_object_get_int64/get_uint64
 2026-07-12 19:46:03 -04:00
Eric Hawicz aab792578b Issue #941: fix "defined but not used" errors when building with a c++ compiler. 2026-07-11 09:28:49 -04:00
Eric Hawicz 324e5ca593 Merge pull request #933 from dxbjavid/int-inc-int64min-overflow 
fix signed overflow negating INT64_MIN in json_object_int_inc
 2026-07-04 11:40:42 -04:00
Eric Hawicz 0c3a5a1994 Issue #934: Also set _userdata=NULL in _json_object_maybe_free() so json_object_put doesn't try to use it as a _delete_parent value. 
Update the test_deep_nesting test output.
 2026-07-04 11:39:02 -04:00
Eric Hawicz e00697585b Merge pull request #936 from dxbjavid/put-free-outside-assert 
free objects outside assert() in json_object_put
 2026-07-04 11:20:48 -04:00
Eric Hawicz 3aa996b5b6 Issue #934: Be sure to clear _user_delete in _json_object_put_maybe_free() to avoid calling it twice. Add a test to check. 2026-07-04 11:02:06 -04:00
Eric Hawicz b299553de1 Issue #824: start listing releases on github 2026-06-27 10:07:26 -04:00
Eric Hawicz c1c7e50e79 Update the master branch to version 0.19.99 2026-06-27 09:55:42 -04:00
Eric Hawicz c54e6900e7 More updates to ChangeLog for a 0.19 release 2026-06-27 09:35:37 -04:00
Eric Hawicz 3c1cf2b5a4 Merge pull request #931 from dxbjavid/patch-copy-deep-copy 
deep copy values in json_patch copy op to avoid aliasing and cycles
 2026-06-27 09:11:43 -04:00
Eric Hawicz d2adb47746 Merge pull request #932 from Alb3e3/harden-ci-permissions 
ci: set least-privilege GITHUB_TOKEN permissions for meson workflow
 2026-06-27 08:44:50 -04:00
Eric Hawicz cce075f551 Merge pull request #930 from dxbjavid/get-double-locale-radix 
fix locale-dependent strtod in json_object_get_double
 2026-06-21 19:46:36 -04:00
Eric Hawicz e1812074fa Issue #928 - work around over-zealous uninitialized check in chromebrew gcc. 2026-06-21 19:25:37 -04:00
Eric Hawicz d9d8cab822 Add tests for the json_parse cli tool. 2026-06-21 13:44:59 -04:00
Eric Hawicz bb9c1238ad Save stderr from test output, allow for non-zero exit code from tests. 2026-06-21 13:43:11 -04:00
Eric Hawicz 1d658982e5 Issue #929: fix bad calculation of error offset when parsing in the apps/json_parse tool. 
Also, show the failing character in hex to ensure error output is readable.
 2026-06-21 12:43:20 -04:00
Eric Hawicz d1018cf6ba Update test_object_iterator.expect to match current test output. 2026-05-25 15:27:48 -04:00
Eric Hawicz 3e708e4c4f Drop osx from .travis.yml since macOS builds are no longer supported. 2026-05-24 16:15:19 -04:00
Eric Hawicz 6167807f3a Merge pull request #925 from mbroz/fix-build 
Fix build with clang-21
 2026-05-24 16:07:11 -04:00
Eric Hawicz dee128f4d6 Issue #927: update the documentation for json_object_iterator to clarify that any change of the fields present on the object being iterated invalidates the iterator. 
Update the test to show what kind of changes _are_ allowed.
 2026-05-23 14:31:45 -04:00
Eric Hawicz 2bfda7114b Remove never used struct json_object_iter_info_ 2026-05-23 14:31:45 -04:00
Eric Hawicz 79474075ce Fix expected output for test_deep_nesting 2026-05-23 14:31:45 -04:00
Eric Hawicz ccd2803b3d Merge pull request #924 from json-c/put_no_recurse 
avoid recursion during json_object_put
 2026-05-03 20:49:09 -04:00
Eric Hawicz 17328a6713 Issue #923: Avoid stack recursion in json_object_put() so heavily nested object trees can be freed. 2026-05-03 20:44:28 -04:00
Eric Hawicz e50fb04154 Add lh_table_delete_entry_to_tail() and array_list_set_idx() functions. 2026-05-03 20:44:08 -04:00
Eric Hawicz 5320cf9753 Add a test to check for issues with deeply nested objects, which can cause problems due to stack recursion. 2026-05-03 20:44:02 -04:00
Eric Hawicz 52ddfb35f1 Fix memory leak in test_safe_json_pointer_set, the caller must free the passed value when json_pointer_set failed. Also, reformat. 2026-02-19 19:05:10 -05:00
Eric Hawicz 8c987e0b73 Issue #919: Fix build on non-x86 windows. Patch thanks to @dotanbrk 2026-02-19 18:48:05 -05:00
Eric Hawicz d7f14cb330 Merge pull request #917 from thely314/fix/oom-too-large-index 
Fix: OOM vulnerability cause by is_valid_index
 2026-02-14 17:23:49 -05:00
Eric Hawicz 8c01a7c32f Merge pull request #903 from neheb/1
meson / Linux-GCC (13) (push) Has been cancelled
meson / Linux-GCC (9) (push) Has been cancelled
meson / Linux-Clang (22) (push) Has been cancelled
meson / Linux-Clang (9) (push) Has been cancelled
meson / VisualStudio (x64) (push) Has been cancelled
meson / VisualStudio (x86) (push) Has been cancelled
meson / VisualStudio-clang-cl (push) Has been cancelled
meson / MSYS2 (CLANG64) (push) Has been cancelled
meson / MSYS2 (UCRT64) (push) Has been cancelled
meson / Cygwin (push) Has been cancelled
meson / MacOS (push) Has been cancelled
meson / DragonflyBSD (push) Has been cancelled
meson / FreeBSD (push) Has been cancelled
meson / NetBSD (push) Has been cancelled
meson / OmniOS (push) Has been cancelled
meson / OpenBSD (push) Has been cancelled
meson / Alpine (aarch64) (push) Has been cancelled
meson / Alpine (armhf) (push) Has been cancelled
meson / Alpine (armv7) (push) Has been cancelled
meson / Alpine (ppc64le) (push) Has been cancelled
meson / Alpine (riscv64) (push) Has been cancelled
meson / Alpine (s390x) (push) Has been cancelled
meson / Alpine (x86) (push) Has been cancelled
meson / Alpine (x86_64) (push) Has been cancelled 
meson: use override_dependency
 2026-02-08 17:08:04 -05:00
Eric Hawicz 46defb4349 Merge pull request #915 from jaisonZheng/fix-macos-locale-memory-leak 
Fix memory leak on macOS by auto-enabling NEWLOCALE_NEEDS_FREELOCALE
 2026-01-31 13:22:57 -05:00
Eric Hawicz d05ea4851f Update ChangeLog, abi-check.sh, AUTHORS and issues_closed list for an upcoming 0.19 release. 2026-01-19 17:46:57 -05:00
Eric Hawicz 8948568031 Merge pull request #913 from mlocati-forks/dll-versioninfo 
Add VERSIONINFO to libjson-c.dll
 2026-01-18 15:25:29 -05:00
Eric Hawicz 26fcd8d569 Merge pull request #910 from bhaible/support-msvc-with-autoconf 
Support MSVC in packages that use GNU Autoconf.
 2026-01-09 23:18:40 -05:00
Eric Hawicz 14c8e2e5ee Merge pull request #907 from travier/master-cmake4 
tests/CMakeLists: Allow build with CMake 4
 2025-12-29 23:42:24 -05:00
Eric Hawicz a1249bfda0 Merge pull request #905 from glance-/fix-typo 
Fix typo
 2025-12-01 06:37:11 -05:00
Eric Hawicz 20974e5f88 Merge pull request #904 from Lakshmi-Surekha/aix-getopt-dont-include 
Include getopt.h header file if the platform is not AIX.
 2025-11-29 11:40:00 -05:00
Eric Hawicz 243ed1a51c Merge pull request #900 from neheb/1 
meson cleanups
 2025-11-04 18:32:47 -05:00
Eric Hawicz 2c412d4593 Merge pull request #899 from Seagate/meson_support 
Meson support
 2025-10-27 16:00:37 -04:00
Eric Hawicz fbdd4bed24 Merge pull request #898 from Seagate/fix_cmake_clangcl 
bug: Fixing Cmake build when using clang-cl
 2025-10-25 09:46:22 -04:00
Eric Hawicz 33f4cb9353 Merge pull request #895 from nim65s/patch-1 
CMake: sync minimum version
 2025-10-25 09:45:50 -04:00
Eric Hawicz 2372e9518e Merge pull request #893 from sffc/supplemental-code-point-bug 
Fix bug involving supplemental code points that look like high surrogates
 2025-08-07 09:46:47 -04:00
Eric Hawicz bf92456789 Make json_parse a bit more useful by adding -u (validate UTF8) and -P (specify arbitrary tokener parse flags), and read from stdin if no filename is provided. 2025-07-08 21:04:00 -04:00
Eric Hawicz 7cee5237dc Issue #867 - also disallow control characters in keys 2025-04-03 21:16:29 -04:00
Eric Hawicz 7bca694b47 Merge pull request #884 from careles/mingw_win64-WIN32_LEAN_AND_MEAN-redefined 
fix macro WIN32_LEAN_AND_MEAN redefined
 2025-01-09 00:12:09 -05:00
Eric Hawicz a304464807 Merge pull request #872 from GitMensch/patch-2 
fix linkhash breaking -std=c89
 2024-12-29 13:34:38 -05:00
Eric Hawicz 7b73916815 Merge pull request #847 from sacredbanana/amiga 
Add support for Commodore Amiga
 2024-12-29 13:26:11 -05:00
Eric Hawicz ee83daa409 Merge pull request #882 from simonresch/handle-nan-to-int-conversion 
Explicitly handle NaN values when converting to integer
 2024-12-26 19:07:07 -05:00
Eric Hawicz 961c31f8ed Merge pull request #879 from janotomko/null 
Handle NULL gracefully in json_tokener_free
 2024-12-07 13:33:05 -05:00
Eric Hawicz c63d4a4194 Merge pull request #878 from 0xfadead/readme-fix-underline 
Fix underline bug in README
 2024-11-23 19:39:50 -05:00
Eric Hawicz 77bb5c54fc Merge pull request #883 from simonresch/add-oss-fuzz-tests 
Add fuzz tests for json_object/point/array apis
 2024-11-23 19:39:13 -05:00
Eric Hawicz ff8ed0f094 Issue #881: don't allow json_tokener_new_ex() with a depth < 1 2024-11-17 22:11:24 -05:00
Eric Hawicz 565f181f65 Fix issue #875: cast to unsigned char so bytes above 0x7f aren't interpreted as negative, which was causing the strict-mode control characters check to incorrectly trigger. 2024-11-08 22:20:40 -05:00
Eric Hawicz 474ee12435 Fix the apps/json_parse "-s" (strict) option so it actually does something, and default to non-strict. 2024-11-03 19:44:21 -05:00
Eric Hawicz 07148f33a1 Merge pull request #873 from esiaero/master 
Correct year in changelog for 0.18 release
 2024-10-10 20:55:18 -04:00
Eric Hawicz c793374f16 Update openssl command to work for newer versions of openssl. 2024-09-15 13:16:48 -04:00
Eric Hawicz e9bd26d568 Update the master branch to version 0.18.99 2024-09-15 13:06:06 -04:00
Eric Haszlakiewicz 7ebdc4ddf8 Update abi-check.sh to compare 0.16 and 0.18 2024-09-15 16:10:57 +00:00
Eric Hawicz 87900c0a2e Fix the expected output for test_parse 2024-09-15 11:59:05 -04:00
Eric Hawicz e5ca4d3b3d Update ChangeLog, AUTHORS and issues_closed_for_0.18.md for an upcoming 0.18 release. 2024-09-15 11:54:50 -04:00
Eric Hawicz e3db88d114 Merge pull request #871 from json-c/disallow-control-chars 
Issue #867: disallow control characters in strict mode.
 2024-09-15 11:22:58 -04:00
Eric Hawicz 6bfab90c87 Issue #867: disallow control characters in strict mode. 2024-09-15 10:37:45 -04:00
Eric Hawicz ecb7a4c9a3 Merge pull request #864 from pavelzw/patch-1 
Build pkg-config for msvc as well
 2024-08-29 21:08:52 -04:00
Eric Hawicz 6e481aa061 Merge pull request #861 from bhaible/handle-another-oom-condition 
Handle yet another out-of-memory condition.
 2024-05-05 09:49:26 -04:00
Eric Haszlakiewicz 781675758f Although CMAKE_C_COMPILER_FRONTEND_VARIANT is defined, it's not always set to some value. Fix builds for cases when it's blank. 2024-04-28 17:15:42 +00:00
Eric Hawicz 31a22fb2da Issue #857: fix a few places where json_tokener should have been returning json_tokener_error_memory but wasn't. 2024-04-21 10:37:16 -04:00
Eric Hawicz 0051f2dbe0 Merge pull request #858 from alurm/master 
json_tokener.h: json_tokener_parse_verbose: fix typo
 2024-04-16 11:23:09 -04:00
Eric Hawicz e3464a2ab4 Issue #829: attempt to detect clang-cl.exe and pass MSVC-compatile command line arguments. 2024-03-29 22:40:45 -04:00
Eric Hawicz 61016412fb Issue #850: fill in & adjust the "@returns" docs for several functions. 2024-03-29 18:46:05 -04:00
Eric Hawicz f2eac07129 doxygen can't handle html on heading, split that to separate lines 
https://github.com/doxygen/doxygen/issues/10466
 2024-03-29 18:45:22 -04:00
Eric Hawicz e93ae70417 Fix issue #854: Set error=json_tokener_error_memory in json_tokener_parser_verbose() when allocating the tokener fails. 2024-03-29 18:09:12 -04:00
Eric Hawicz 0bc2dd5e60 Merge pull request #852 from fedefrancescon/docs/micro-typo-fix 
docs: micro typo in json_object_put doc
 2024-03-02 17:31:24 -05:00
Eric Hawicz 401249cbdf Merge pull request #831 from neheb/1 
rename WIN32 to _WIN32
 2024-02-08 08:11:57 -05:00
Eric Hawicz dabed80523 Merge pull request #849 from rouault/random_seed_toctou 
random_seed.c: add a Coverity Scan suppression
 2024-01-08 12:45:39 -05:00
Eric Hawicz 76f819e51d Merge pull request #846 from evo-i/CMP0153 
Use execute_process instead of exec_program
 2023-12-17 07:23:07 -05:00
Eric Haszlakiewicz 407ddb4350 Issue #842 - fix one particular sign conversion warning. 
There are many others that show up if we were to add -Wsign-conversions,
but this is the only one using a literal constant.
 2023-11-30 13:59:13 +00:00
Eric Hawicz 33337523f5 Merge pull request #839 from ffontaine/master 
json_pointer.c: initialize idx
 2023-11-08 18:11:13 -05:00
Eric Hawicz 88bce2b38e Merge pull request #837 from HansolChoe/fix-tokener-parse-ex-fuzzer 
Add type checking for parsed objects in tokener_parse_ex_fuzzer
 2023-10-19 07:49:32 -04:00
Eric Hawicz ad8b8afa7d Take 2 fixing the placement of json_tokener_error_memory in the enum. (json_tokener_error_size is an actual error, *not* a measure of the size of the enum!) 2023-09-22 22:26:21 -04:00
Eric Hawicz 4186537557 Merge pull request #827 from robert-pang/master 
Resolve build issue in tokener_parse_ex_fuzzer.c
 2023-09-11 00:13:45 +02:00
Eric Hawicz 9ff6b68baf Merge pull request #826 from emlix/cmake-policies 
CMake: remove needless policy setting
 2023-09-11 00:10:55 +02:00
Eric Haszlakiewicz 502522a93d Update the master branch to version 0.17.99 2023-08-12 19:08:59 +00:00
Eric Hawicz 12ea386989 Add an abi-check.sh script that shows how to run the abi-compliance-checker, update release creation steps slightly. 2023-08-12 14:56:51 -04:00
Eric Haszlakiewicz 6dd8618170 Also fix messages returned from json_tokener_error_desc() (broke due to the ordering change of enum json_tokener_error) 2023-08-12 18:52:32 +00:00
Eric Hawicz 3dad6941da Move the json_tokener_error_memory entry to the end of enum json_tokener_error to restore binary compatibility with 0.16 2023-08-12 13:54:50 -04:00
Eric Hawicz f7e9d8e216 Update the AUTHORS file and add issues_closed_for_0.17.md for the upcoming 0.17 release 2023-08-12 13:53:27 -04:00
Eric Hawicz 85ed501a3d Update the ChangeLog for 0.17 based on notable commits since 0.16 2023-08-08 17:31:38 -04:00
Eric Hawicz 077661f3d1 Fix issue #823: add back json_number_chars, but only because it's part of the public API. 2023-08-06 15:36:19 -04:00
Eric Hawicz 87127d31c6 Merge pull request #679 from GitMensch/patch-1 
Let json-c be used with obsolete compilers
 2023-08-05 22:32:37 -04:00
Eric Hawicz 1ee12100b6 PR #679: add workaround for old compilers w/o stdint.h (i.e. VS2008 and earlier) 2023-08-05 22:11:30 -04:00
Eric Hawicz 0bcfb6bc84 Merge pull request #822 from SSharshunov/master 
Added option to disable app build
 2023-08-04 11:47:23 -04:00
Eric Hawicz 2316dbae85 Merge pull request #702 from commodo/json_patch 
json_patch: add first implementation only with patch application
 2023-07-31 22:19:30 -04:00
Eric Hawicz 612ba56f06 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 2023-07-31 22:18:04 -04:00
Eric Hawicz 469bc0e4bb Work around a somewhat misleading warning about "a function declaration without a prototype is deprecated in all versions of C" in test1.c 2023-07-31 22:18:04 -04:00