Commit Graph

Select branches

Hide Pull Requests

disallow-control-chars

gh-pages

issue808-ios-build

json-c-0.10

json-c-0.11

json-c-0.12

json-c-0.13

json-c-0.14

json-c-0.15

json-c-0.16

json-c-0.17

json-c-0.18

json_object-split

master

json-c-0.10-20120530

json-c-0.11-20130402

json-c-0.12-20140410

json-c-0.12.1-20160607

json-c-0.13-20171207

json-c-0.13.1-20180305

json-c-0.14-20200419

json-c-0.15-20200726

json-c-0.16-20220414

json-c-0.17-20230812

json-c-0.18-20240915

Mono Color

• 7bca694b47 Merge pull request #884 from careles/mingw_win64-WIN32_LEAN_AND_MEAN-redefined master Eric Hawicz 2025-01-09 00:12:09 -05:00
• 51bcdd0000 fix macro WIN32_LEAN_AND_MEAN redefined Careles 2025-01-06 10:56:53 +08:00
• a304464807 Merge pull request #872 from GitMensch/patch-2 Eric Hawicz 2024-12-29 13:34:38 -05:00
• 7b73916815 Merge pull request #847 from sacredbanana/amiga Eric Hawicz 2024-12-29 13:26:11 -05:00
• ee83daa409 Merge pull request #882 from simonresch/handle-nan-to-int-conversion Eric Hawicz 2024-12-26 19:07:07 -05:00
• ca1a6b0cc9 Add support for MorphOS Cameron Armstrong (Nightfox) 2024-08-31 03:57:46 +08:00
• daff6eb746 Remove linking to libamiga and libc Cameron Armstrong (Nightfox) 2024-08-05 12:50:47 +08:00
• 254b5abef8 Do not use duplocale if building for libnix because it isnt supported yet Cameron Armstrong (Nightfox) 2024-07-15 11:30:44 +08:00
• d31d635af1 Clean up CMakeLists.txt and remove Amiga specific locale.h guard Cameron Armstrong (Nightfox) 2024-06-22 18:49:50 +08:00
• 743ebf53e5 Fix Readme Cameron Armstrong (Nightfox) 2024-06-22 13:45:15 +08:00
• f928e7c0fa Get working ror libnix and clib2 Cameron Armstrong 2023-12-28 07:53:32 +08:00
• 4feebc1cd6 Add support for Commodore Amiga Cameron Armstrong 2023-12-23 19:47:38 +08:00
• 961c31f8ed Merge pull request #879 from janotomko/null Eric Hawicz 2024-12-07 13:33:05 -05:00
• 0c3588330a Set error codes for truncating int conversions Simon Resch 2024-11-26 20:42:29 +01:00
• 8c13801f2c Explicitly handle NaN values when converting to int Simon Resch 2024-11-14 13:47:18 +01:00
• c63d4a4194 Merge pull request #878 from 0xfadead/readme-fix-underline Eric Hawicz 2024-11-23 19:39:50 -05:00
• 77bb5c54fc Merge pull request #883 from simonresch/add-oss-fuzz-tests Eric Hawicz 2024-11-23 19:39:13 -05:00
• 839fbe0d63 Add fuzz tests for json_object/point/array apis Simon Resch 2024-11-08 22:20:40 -05:00
• ff8ed0f094 Issue #881: don't allow json_tokener_new_ex() with a depth < 1 Eric Hawicz 2024-11-17 22:11:24 -05:00
• 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. Eric Hawicz 2024-11-08 22:20:40 -05:00
• 828c12b226 Handle NULL gracefully in json_tokener_free Ján Tomko 2024-11-06 15:19:04 +01:00
• 474ee12435 Fix the apps/json_parse "-s" (strict) option so it actually does something, and default to non-strict. Eric Hawicz 2024-11-03 19:44:21 -05:00
• d6b973e047 Fix underline bug in README Awildidiot 2024-11-03 20:03:49 +01:00
• 07148f33a1 Merge pull request #873 from esiaero/master Eric Hawicz 2024-10-10 20:55:18 -04:00
• 2ec0b87b58 Correct year in changelog for 0.18 release Evan Si 2024-10-10 23:47:55 +00:00
• 6aab3da807 fix linkhash breaking -std=c89 Simon Sobisch 2024-10-07 08:16:42 +00:00
• c793374f16 Update openssl command to work for newer versions of openssl. Eric Hawicz 2024-09-15 13:16:48 -04:00
• 49790dd1ab Update the doc links to point at 0.18 gh-pages Eric Haszlakiewicz 2024-09-15 17:09:26 +00:00
• 22206e8a2b Add the 0.18 docs. Eric Haszlakiewicz 2024-09-15 17:07:58 +00:00
• e9bd26d568 Update the master branch to version 0.18.99 Eric Hawicz 2024-09-15 13:06:06 -04:00
• 41a55cfced Generate docs for the 0.18 release json-c-0.18-20240915 json-c-0.18 Eric Haszlakiewicz 2024-09-15 16:22:45 +00:00
• afdca3ab5e Bump version to 0.18 Eric Haszlakiewicz 2024-09-15 16:17:32 +00:00
• 7ebdc4ddf8 Update abi-check.sh to compare 0.16 and 0.18 Eric Haszlakiewicz 2024-09-15 16:10:57 +00:00
• 87900c0a2e Fix the expected output for test_parse Eric Hawicz 2024-09-15 11:59:05 -04:00
• e5ca4d3b3d Update ChangeLog, AUTHORS and issues_closed_for_0.18.md for an upcoming 0.18 release. Eric Hawicz 2024-09-15 11:46:56 -04:00
• e3db88d114 Merge pull request #871 from json-c/disallow-control-chars Eric Hawicz 2024-09-15 11:22:58 -04:00
• 6bfab90c87 Issue #867: disallow control characters in strict mode. disallow-control-chars Eric Hawicz 2024-09-02 09:43:04 -04:00
• 7fb43410af 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!) json-c-0.17 Eric Hawicz 2023-09-22 22:26:21 -04:00
• ecb7a4c9a3 Merge pull request #864 from pavelzw/patch-1 Eric Hawicz 2024-08-29 21:08:52 -04:00
• 906d1581de Update CMakeLists.txt Pavel Zwerschke 2024-08-29 10:55:02 +02:00
• 9b8d170d1f Build pkg-config for msvc as well Pavel Zwerschke 2024-06-18 00:11:13 +02:00
• 6e481aa061 Merge pull request #861 from bhaible/handle-another-oom-condition Eric Hawicz 2024-05-05 09:49:26 -04:00
• 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. Eric Haszlakiewicz 2024-04-28 17:15:42 +00:00
• 833233faa8 Handle yet another out-of-memory condition. Bruno Haible 2024-04-22 01:50:59 +02:00
• 31a22fb2da Issue #857: fix a few places where json_tokener should have been returning json_tokener_error_memory but wasn't. Eric Hawicz 2024-04-21 10:37:16 -04:00
• 0051f2dbe0 Merge pull request #858 from alurm/master Eric Hawicz 2024-04-16 11:23:09 -04:00
• 0741ce3918 json_tokener.h: json_tokener_parse_verbose: fix typo Alan Urmancheev 2024-04-16 14:56:00 +00:00
• e3464a2ab4 Issue #829: attempt to detect clang-cl.exe and pass MSVC-compatile command line arguments. Eric Hawicz 2024-03-29 22:40:45 -04:00
• 61016412fb Issue #850: fill in & adjust the "@returns" docs for several functions. Eric Hawicz 2024-03-29 18:46:05 -04:00
• f2eac07129 doxygen can't handle html on heading, split that to separate lines https://github.com/doxygen/doxygen/issues/10466 Eric Hawicz 2024-03-29 18:45:22 -04:00
• e93ae70417 Fix issue #854: Set error=json_tokener_error_memory in json_tokener_parser_verbose() when allocating the tokener fails. Eric Hawicz 2024-03-29 18:09:12 -04:00
• 0bc2dd5e60 Merge pull request #852 from fedefrancescon/docs/micro-typo-fix Eric Hawicz 2024-03-02 17:31:24 -05:00
• 9c44c7ed52 docs: micro typo in json_object_get doc Federico Francescon 2024-03-02 22:41:10 +01:00
• 401249cbdf Merge pull request #831 from neheb/1 Eric Hawicz 2024-02-08 08:11:57 -05:00
• 66f7869219 rename WIN32 to _WIN32 Rosen Penev 2023-09-13 20:51:49 -07:00
• dabed80523 Merge pull request #849 from rouault/random_seed_toctou Eric Hawicz 2024-01-08 12:45:39 -05:00
• f6c8eba84e random_seed.c: add a Coverity Scan suppression Even Rouault 2024-01-07 20:55:35 +01:00
• 76f819e51d Merge pull request #846 from evo-i/CMP0153 Eric Hawicz 2023-12-17 07:23:07 -05:00
• eef983b1df Update CMakeLists.txt evo 2023-12-17 11:19:20 +03:00
• c0cf4bc23b Update CMakeLists.txt evo 2023-12-17 00:32:21 +03:00
• e85c8ada54 Fix ECHO_OUTPUT_VARIABLE evo 2023-12-17 00:23:51 +03:00
• 2c84476c77 [CMP0153](https://cmake.org/cmake/help/latest/policy/CMP0153.html) evo 2023-12-12 16:28:41 +03:00
• 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. Eric Haszlakiewicz 2023-11-30 13:59:13 +00:00
• 33337523f5 Merge pull request #839 from ffontaine/master Eric Hawicz 2023-11-08 18:11:13 -05:00
• 7ff7eab603 json_pointer.c: initialize idx Fabrice Fontaine 2023-11-08 22:42:48 +01:00
• 88bce2b38e Merge pull request #837 from HansolChoe/fix-tokener-parse-ex-fuzzer Eric Hawicz 2023-10-19 07:49:32 -04:00
• a907f7dd1b tokener_parse_ex_fuzzer: add type checking for parsed object HansolChoe 2023-10-19 16:33:01 +09:00
• 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!) Eric Hawicz 2023-09-22 22:26:21 -04:00
• 4186537557 Merge pull request #827 from robert-pang/master Eric Hawicz 2023-09-11 00:13:45 +02:00
• 9ff6b68baf Merge pull request #826 from emlix/cmake-policies Eric Hawicz 2023-09-11 00:10:55 +02:00
• 1a7defaa69 Fix variable and API names in tokener_parse_ex_fuzzer.cc to resolve build issue. Robert Pang 2023-09-05 13:58:51 -07:00
• c4a615a052 CMake: request all policies up to CMake 3.12 being set to NEW Rolf Eike Beer 2023-09-05 14:31:24 +02:00
• 159822dd8a CMake: request consistent minimum version Rolf Eike Beer 2023-09-05 14:27:27 +02:00
• 990acb4e19 CMake: remove needless policy setting Rolf Eike Beer 2023-09-05 12:14:46 +02:00
• b62ea12bd0 Update the doc links to point at 0.17 Eric Haszlakiewicz 2023-08-12 19:13:30 +00:00
• 106988e3ae Add the 0.17 docs. Eric Haszlakiewicz 2023-08-12 19:10:14 +00:00
• 502522a93d Update the master branch to version 0.17.99 Eric Haszlakiewicz 2023-08-12 19:08:59 +00:00
• b4c371fa0c Generate docs for the 0.17 release json-c-0.17-20230812 Eric Haszlakiewicz 2023-08-12 19:00:16 +00:00
• 21c70bd767 Bump version to 0.17 Eric Haszlakiewicz 2023-08-12 18:59:13 +00:00
• 12ea386989 Add an abi-check.sh script that shows how to run the abi-compliance-checker, update release creation steps slightly. Eric Hawicz 2023-08-12 14:34:35 -04:00
• 6dd8618170 Also fix messages returned from json_tokener_error_desc() (broke due to the ordering change of enum json_tokener_error) Eric Haszlakiewicz 2023-08-12 18:52:32 +00:00
• 3dad6941da Move the json_tokener_error_memory entry to the end of enum json_tokener_error to restore binary compatibility with 0.16 Eric Hawicz 2023-08-12 13:54:50 -04:00
• f7e9d8e216 Update the AUTHORS file and add issues_closed_for_0.17.md for the upcoming 0.17 release Eric Hawicz 2023-08-12 13:53:27 -04:00
• 85ed501a3d Update the ChangeLog for 0.17 based on notable commits since 0.16 Eric Hawicz 2023-08-08 17:31:38 -04:00
• 077661f3d1 Fix issue #823: add back json_number_chars, but only because it's part of the public API. Eric Hawicz 2023-08-06 15:35:04 -04:00
• 87127d31c6 Merge pull request #679 from GitMensch/patch-1 Eric Hawicz 2023-08-05 22:32:37 -04:00
• 1ee12100b6 PR #679: add workaround for old compilers w/o stdint.h (i.e. VS2008 and earlier) Eric Hawicz 2023-08-05 22:11:30 -04:00
• 0bcfb6bc84 Merge pull request #822 from SSharshunov/master Eric Hawicz 2023-08-04 11:47:23 -04:00
• bef40a342e Added option to disable app build Sergey Sharshunov 2023-08-04 19:46:50 +05:00
• 2316dbae85 Merge pull request #702 from commodo/json_patch Eric Hawicz 2023-07-31 22:19:30 -04:00
• 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 Eric Hawicz 2023-07-29 21:45:16 -04:00
• 469bc0e4bb Work around a somewhat misleading warning about "a function declaration without a prototype is deprecated in all versions of C" in test1.c Eric Hawicz 2023-07-29 11:22:12 -04:00
• ce3184243a 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. Eric Hawicz 2023-07-28 22:12:51 -04:00
• 9dbf2880cc 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. Eric Hawicz 2023-07-26 22:01:04 -04:00
• a14a3a680c Fix an uninitialized memory access in json_pointer. Add comments describing when the fields of the internal struct json_pointer_get_result are valid. Eric Hawicz 2023-07-26 18:15:07 -04:00
• efc530594b Create a json_pointer_private.h and move a few things there, fix test warnings, note array_list_insert_idx is private. Eric Hawicz 2023-07-16 10:48:20 -04:00
• 3b8363fcdc tests: test_json_patch: add test suite for JSON patch Alexandru Ardelean 2021-04-20 15:47:18 +03:00
• 538b046884 json_patch: add first implementation only with patch application Alexandru Ardelean 2021-04-24 17:00:13 +03:00
• e4d9fbd52a json_pointer: split json_pointer_set_with_array_cb() Alexandru Ardelean 2021-04-23 21:56:29 +03:00
• 1c38dea651 json_pointer: move array out-of-bounds check outside of is_valid_index() Alexandru Ardelean 2021-04-23 21:19:49 +03:00