Commit Graph

  • *
  • *
  • *
  • | *
  • |/|
  • * |
  • * |
  • | | *
  • | | *
  • * | |
  • * | |
  • | | | *
  • | | | *
  • | |_|/
  • |/| |
  • * | |
  • * | |
  • * | |
  • |\ \ \
  • | * | |
  • |/ / /
  • * | |
  • * | |
  • |\ \ \
  • * | | |
  • | | | | *
  • | |_|_|/|
  • |/| | | |
  • | * | | |
  • * | | | |
  • * | | | |
  • |\ \ \ \ \
  • | |/ / / /
  • |/| | | |
  • | * | | |
  • |/ / / /
  • | | | | *
  • | |_|_|/
  • |/| | |
  • | | | | *
  • | |_|_|/
  • |/| | |
  • * | | |
  • |\ \ \ \
  • * \ \ \ \
  • |\ \ \ \ \
  • | | * | | |
  • | |/ / / /
  • |/| | | |
  • | * | | |
  • | * | | |
  • |/ / / /
  • * | | |
  • |\ \ \ \
  • * \ \ \ \
  • |\ \ \ \ \
  • | * | | | |
  • |/ / / / /
  • | * | | |
  • * | | | |
  • |\ \ \ \ \
  • * \ \ \ \ \
  • |\ \ \ \ \ \
  • * \ \ \ \ \ \
  • |\ \ \ \ \ \ \
  • | |_|_|/ / / /
  • |/| | | | | |
  • | | | * | | |
  • | |_|/ / / /
  • |/| | | | |
  • | | * | | |
  • | |/ / / /
  • |/| | | |
  • | * | | |
  • |/ / / /
  • * | | |
  • |\ \ \ \
  • * \ \ \ \
  • |\ \ \ \ \
  • | * | | | |
  • |/ / / / /
  • | * / / /
  • |/ / / /
  • * | | |
  • |\ \ \ \
  • * \ \ \ \
  • |\ \ \ \ \
  • * \ \ \ \ \
  • |\ \ \ \ \ \
  • * \ \ \ \ \ \
  • |\ \ \ \ \ \ \
  • | * | | | | | |
  • |/ / / / / / /
  • | | * / / / /
  • | |/ / / / /
  • |/| | | | |
  • | * | | | |
  • |/ / / / /
  • | | | | | *
  • | |_|_|_|/
  • |/| | | |
  • | * | | |
  • |/ / / /
  • * | | |
  • |\ \ \ \
  • | * | | |
  • |/ / / /
  • * | | |
  • | | | | *
  • | |_|_|/
  • |/| | |
  • * | | |
  • * | | |
  • * | | |
  • |\ \ \ \
  • | * | | |
  • | * | | |
  • | * | | |
  • | * | | |
  • |/ / / /
  • * | | |
  • * | | |
  • |\ \ \ \
  • | * | | |
  • | * | | |
  • | * | | |
  • |/ / / /
  • * | | |
  • |\ \ \ \
  • | * | | |
  • * | | | |
  • |\ \ \ \ \
  • | |/ / / /
  • |/| | | |
  • | * | | |
  • |/ / / /
  • | | | | *
  • | |_|_|/
  • |/| | |
  • | | | | *
  • | |_|_|/|
  • |/| | | |
  • * | | | |
  • |\ \ \ \ \
  • | * | | | |
  • |/ / / / /
  • | | | | | *
  • | | | | | *
  • | |_|_|_|/
  • |/| | | |
  • * | | | |
  • |\ \ \ \ \
  • | * | | | |
  • |/ / / / /
  • * | | | |
  • |\ \ \ \ \
  • | * | | | |
  • |/ / / / /
  • * | | | |
  • * | | | |
  • * | | | |
  • |\ \ \ \ \
  • | * | | | |
  • | | | | | | *
  • | | |_|_|_|/
  • | |/| | | |
  • | | | | | *
  • | | | | | *
  • | | | | | *
  • | | | | | *
  • | | | | | *
  • | | | | | | *
  • | | |_|_|_|/
  • | |/| | | |
  • | | | | | *
  • | | | | | *
  • | | | | | *
  • | | | | | *
  • | | | | | *
  • 2f0942b Specify dependent libraries, including -lbsd, in a more consistent way so linking against a static json-c works better. Related issue #766 Use target_link_libraries, plus fill in Libs.private in json-c.pc so pkg-config --static --libs works appropriately. Also, only link against libbsd when arc4random is actually found there. by Eric Haszlakiewicz 2022-05-30 15:30:11 +0000
  • 6ba1adf Include the tests and apps directories at the _end_, since order in the cmake rules matters, and fix compile warnings now that we're building those sources with all the regular flags. by Eric Haszlakiewicz 2022-05-30 14:33:16 +0000
  • 86b46ca Add --disable-static and --disable-dynamic options to the cmake-configure script. by Eric Haszlakiewicz 2022-05-30 14:31:08 +0000
  • 088deea (refs/pull/583/merge) Merge 968bdd099d into f2fc1ca00a by Chris Wolfe 2022-05-01 20:54:06 +0900
  • f2fc1ca Note the DSIABLE_JSON_POINTER and DISABLE_EXTRA_LIBS build options on the README by Eric Haszlakiewicz 2022-04-14 12:57:43 +0000
  • acccefd Add a "Getting Help" section to the README. by Eric Haszlakiewicz 2022-04-14 12:55:32 +0000
  • 294efec Update the doc links to point at 0.16. Drop broken link to oss.metaparadigm.com. by Eric Haszlakiewicz 2022-04-14 12:36:26 +0000
  • 76db574 Add the 0.16 docs. by Eric Haszlakiewicz 2022-04-14 12:34:00 +0000
  • de5a648 Update the master branch to version 16.99 by Eric Haszlakiewicz 2022-04-14 12:29:39 +0000
  • 7e3eba7 Clarify how to set the uploaded release tarballs to be publically readable. by Eric Haszlakiewicz 2022-04-14 12:17:59 +0000
  • 2f2ddc1 (tag: json-c-0.16-20220414, json-c-0.16) Generate docs for the 0.16 release by Eric Haszlakiewicz 2022-04-14 01:12:43 +0000
  • 2c63585 Bump version to 0.16 by Eric Haszlakiewicz 2022-04-14 01:10:39 +0000
  • 7d30347 Update the ChangeLog with recent changes, in preparation for a 0.16 release. Add a list of issues closed for this release. by Eric Haszlakiewicz 2022-04-14 00:21:13 +0000
  • 66dcdf5 Add new authors since the 0.15 release, tweak instructions for how to update that list. by Eric Haszlakiewicz 2022-04-13 23:16:34 +0000
  • 4902f9c Merge pull request #765 from jvoisin/patch-1 by Eric Hawicz 2022-04-13 14:28:51 -0400
  • 558d48a (refs/pull/765/head) Improve a bit the coverage of the fuzzer by Julien Voisin 2022-04-13 15:42:46 +0200
  • 46b58ad Fix issue #764: adjust test_util_file to match new output (changed in 6e53347) by Eric Haszlakiewicz 2022-04-08 22:58:24 +0000
  • 0b937f6 Merge pull request #758 from c3h2-ctf/context by Eric Hawicz 2022-04-04 18:01:39 -0400
  • 65274cf Update issue templates by Eric Hawicz 2022-04-04 17:10:31 -0400
  • d980277 (refs/pull/680/merge) Merge c66722ca9a into e244146dfd by Jakub Zwolakowski 2022-04-01 19:42:07 +0900
  • 0c0d901 (refs/pull/758/head) Preserve context if out of memory by Tobias Stoeckmann 2022-03-20 13:22:46 +0100
  • e244146 Remove single quote from #error line. Fixes issue #761 by Eric Haszlakiewicz 2022-03-25 01:11:52 +0000
  • a1c092b Merge pull request #760 from BonsaiYi/error by Eric Hawicz 2022-03-23 00:14:36 -0400
  • 716978f (refs/pull/760/head) Code style removed unneeded double-quotes by BonsaY 2022-03-21 21:10:45 +0100
  • 9e6acc9 (refs/pull/759/head) json_tokener_parse_ex: handle out of memory errors by Tobias Stoeckmann 2022-03-20 17:22:07 +0100
  • 5accae0 (refs/pull/757/head) json_object_from_fd_ex: fail if file is too large by Tobias Stoeckmann 2022-03-20 13:17:37 +0100
  • 79459b2 Merge pull request #755 from c3h2-ctf/error by Eric Hawicz 2022-03-19 10:05:48 -0400
  • 2326e34 Merge pull request #754 from c3h2-ctf/doc by Eric Hawicz 2022-03-19 10:04:58 -0400
  • 6e53347 (refs/pull/755/head) Fix error messages by Tobias Stoeckmann 2022-03-19 10:59:43 +0100
  • a7d85bf (refs/pull/754/head) Fix typos in comments by Tobias Stoeckmann 2022-03-19 10:39:10 +0100
  • cbc603b Adjusted URLs by Tobias Stoeckmann 2022-03-19 10:34:55 +0100
  • f0d93ce Merge pull request #748 from c3h2-ctf/printbuf by Eric Hawicz 2022-03-07 00:06:57 -0500
  • 9b832c8 Merge pull request #752 from c3h2-ctf/typos by Eric Hawicz 2022-03-06 23:33:42 -0500
  • 543a8eb (refs/pull/752/head) Fix typos by Tobias Stoeckmann 2022-03-06 16:07:36 +0100
  • 94b2a0c (refs/pull/748/head) sprintbuf(): test for all vsnprintf error values by Tobias Stoeckmann 2022-02-27 21:45:28 +0100
  • a4389f4 Merge pull request #749 from c3h2-ctf/sprintbuf by Eric Hawicz 2022-03-03 21:32:09 -0500
  • 4493db7 Merge pull request #750 from c3h2-ctf/clearmem by Eric Hawicz 2022-03-03 21:29:27 -0500
  • 1491d92 Merge pull request #751 from c3h2-ctf/arguments by Eric Hawicz 2022-03-03 21:26:22 -0500
  • d07da04 (refs/pull/749/head) sprintbuf(): handle printbuf_memappend errors by Tobias Stoeckmann 2022-03-03 21:24:27 +0100
  • 63c602f (refs/pull/750/head) printbuf_memset(): set gaps to zero by Tobias Stoeckmann 2022-03-03 21:18:53 +0100
  • 4355242 (refs/pull/751/head) printbuf: do not allow invalid arguments by Tobias Stoeckmann 2022-03-03 21:15:19 +0100
  • bd56cc8 Merge pull request #745 from c3h2-ctf/vasprintf by Eric Hawicz 2022-02-27 08:34:21 -0500
  • 723ac8c Merge pull request #746 from rouault/typo_fixes by Eric Hawicz 2022-02-26 23:45:15 -0500
  • 3bb54f9 (refs/pull/746/head) Fix typos in code comments and ChangeLog by Even Rouault 2022-02-25 00:14:47 +0100
  • 5c72257 (refs/pull/745/head) vasprintf(): avoid out of memory accesses by Tobias Stoeckmann 2022-02-24 21:35:44 +0100
  • 66cce0a Merge pull request #739 from rouault/avoid_unsigned_integer_overflow by Eric Hawicz 2022-02-18 20:21:18 -0500
  • b11f79c Merge pull request #741 from rouault/json_type_to_name_formatter by Eric Hawicz 2022-02-18 20:08:31 -0500
  • 78246db Merge pull request #742 from rouault/json_object_copy_serializer_data_add_assertion by Eric Hawicz 2022-02-18 20:08:02 -0500
  • a1ea216 Merge pull request #744 from Kizuna-Meraki/close-random by Eric Hawicz 2022-02-18 20:07:33 -0500
  • d783ad7 (refs/pull/744/head) Close file on error path. by Kizuna-Meraki 2022-02-17 21:27:01 +0100
  • f2c0df4 (refs/pull/741/head) json_type_to_name(): use correct printf() formatter by Even Rouault 2022-01-16 20:48:27 +0100
  • 82d9433 (refs/pull/742/head) json_object_copy_serializer_data(): add assertion by Even Rouault 2022-01-16 20:50:56 +0100
  • a406ec9 (refs/pull/740/head) Fix warnings of clang -Wshorten-64-to-32 by Even Rouault 2022-01-12 23:54:25 +0100
  • 296db61 (refs/pull/739/head) json_escape_str(): avoid harmless unsigned integer overflow by Even Rouault 2022-01-12 23:43:03 +0100
  • 3b4f1e9 Merge pull request #737 from tniessen/patch-1 by Eric Hawicz 2022-01-11 21:25:38 -0500
  • 928fa96 (refs/pull/737/head) Fix typo in README by Tobias Nießen 2022-01-10 00:12:25 +0100
  • a5c2e11 Cause the cmake include dirs to also have ${CMAKE_INSTALL_INCLUDEDIR}/json-c, so downstream packages that use cmake to link against json-c can choose whether to include headers as just e.g. #include <json_object.h>, if they care to do so. Update the README to better explain this, and make a few other tweaks. by Eric Haszlakiewicz 2021-12-22 02:52:37 +0000
  • 9577253 (refs/pull/735/head) Add policy_max to minimum required cmake version by tzik 2021-12-15 15:54:11 +0900
  • 2d2382d Add linkhash accessor functions (lh_table_head(), lh_entry_next(), etc...) to pave the way for making the lh_table and lh_entry structure opaque in the future. Update the docs to mark all members of those structures deprecated, and suggest what to use instead. by Eric Haszlakiewicz 2021-11-30 03:27:55 +0000
  • 320548c Drop the REFCOUNT_DEBUG code, it hasn't been used in ages. by Eric Haszlakiewicz 2021-11-30 03:08:02 +0000
  • 9a90b84 Merge pull request #734 from json-c/newer-appveyor by Eric Hawicz 2021-11-29 13:40:41 -0500
  • 1cb56e7 (refs/pull/734/head) Put the most recent image first in appveyor builds. by Eric Haszlakiewicz 2021-11-29 18:21:05 +0000
  • 1763eda Skip most "Release" builds. s/b_config/CONFIGURATION/ to fix artifact creation. by Eric Haszlakiewicz 2021-11-29 18:18:48 +0000
  • a5fed59 There doesn't seem to be a way to extend the appveyor build matrix for just one image, so instead list a whole bunch of excluded builds. by Eric Haszlakiewicz 2021-11-27 02:55:29 +0000
  • 0910e18 Use the newer appveyor images to build for VS2017 and VS2019. Trim the number of builds we do. by Eric Haszlakiewicz 2021-11-27 02:29:26 +0000
  • f1fb9ab Note the need to also set CTEST_OUTPUT_ON_FAILURE to get test output by Eric Haszlakiewicz 2021-11-26 22:49:06 +0000
  • 42aa6f7 Merge pull request #732 from DiracResearch/fix/static_include_dirs by Eric Hawicz 2021-11-11 23:52:43 -0500
  • 286b4fd (refs/pull/732/head) Fix uninitialized value error for clang-8 msan by Robert Bielik 2021-11-11 10:23:05 +0100
  • a66a6cc Fix for clang ub sanitizer by Robert Bielik 2021-11-11 09:35:31 +0100
  • 21f767f Add target include dirs for static library as well by Robert Bielik 2021-11-10 16:04:01 +0100
  • 9b0fb2b Merge pull request #727 from jobol/propo2 by Eric Hawicz 2021-10-22 19:06:11 -0400
  • 8bf3b45 (refs/pull/727/head) Really use prefix JSON_C_OBJECT_ADD_* by José Bollo 2021-10-12 14:42:12 +0200
  • 05c5d15 Merge pull request #729 from DeX77/patch-1 by Eric Hawicz 2021-10-17 14:23:28 -0400
  • d6d4b71 (refs/pull/729/head) * don't assume includedir by DeX77 2021-10-15 11:12:39 +0200
  • 503e8b3 (refs/pull/728/head) DRAFT PROPOSAL - Add option JSON_C_OBJECT_ADD_IF_NOT_NULL by José Bollo 2021-10-12 14:32:04 +0200
  • bebda92 (refs/pull/715/merge) Merge 816b00c1c6 into 382f9462c2 by Hex052 2021-10-12 17:06:19 +0800
  • 382f946 Merge pull request #726 from leongross/fix/test-cmake3.1 by Eric Hawicz 2021-10-09 09:17:25 -0400
  • 8be2ffd (refs/pull/726/head) fix cmake version for tests by Leon Gross 2021-10-06 14:40:52 +0200
  • 3cab5e7 (refs/pull/724/head) fix Issue #723. by correy 2021-09-29 10:05:57 +0800
  • ac76669 #723 by correy 2021-09-29 09:28:22 +0800
  • 4fc44f3 Merge pull request #722 from imaami/fix-json_tokener_new_ex-use-after-free by Eric Hawicz 2021-09-04 23:16:13 -0400
  • 9361d8d (refs/pull/722/head) Fix use-after-free in json_tokener_new_ex() by Juuso Alasuutari 2021-09-04 20:14:30 +0300
  • dc1ef7d Merge pull request #718 from Pawday/master by Eric Hawicz 2021-07-31 22:46:01 -0400
  • e91e4cc (refs/pull/718/head) Setted cmake "uninstall" target to exist in unix like operating systems only by Pawday 2021-07-26 18:52:29 +0300
  • f61f1a7 Add workaround for Visual Studio not knowing about "inline". by Eric Haszlakiewicz 2021-07-25 20:31:59 +0000
  • db6a6cc Switch the Travis build to use osx_image: xcode12.5, in an attempt to avoid timeouts with Homebrew. by Eric Haszlakiewicz 2021-07-25 20:03:55 +0000
  • 6a0df26 Merge some old work to include (some of) PR #464 into the current master branch. by Eric Haszlakiewicz 2021-07-25 19:07:06 +0000
  • 8c727e5 Only define an "uninstall" target if it's not already defined (e.g. by projects that include json-c) by Eric Haszlakiewicz 2021-07-25 15:11:11 +0000
  • 9b08491 (refs/pull/717/head) Cmake is able delete all files by "clean" target by Pawday 2021-07-23 16:23:31 +0300
  • 816b00c (refs/pull/715/head) Add new functions so any old things still work by HexTheDragon 2021-07-18 16:44:51 -0800
  • 85ca6f8 Keep `json_object_object_foreach` the same by HexTheDragon 2021-07-18 13:08:07 -0800
  • 95225e6 Move a header back that shouldn't have been moved I moved this before when I was using ssize_t in linkhash.c, but I moved `struct lh_string` to `struct json_key` in a different file, so this isn't needed anymore by HexTheDragon 2021-07-18 13:05:23 -0800
  • 65e0969 Modifications so it compiles on Windows correctly by HexTheDragon 2021-07-11 13:53:26 -0800
  • 2c9019f Rename lh_string to json_key and move to json_object.h by HexTheDragon 2021-07-10 23:19:31 -0800
  • ac714fe (refs/pull/716/head) Fixed cmake command by Amrit Bhogal 2021-07-09 14:19:30 -0700
  • 0a8f719 Add additional tests and fix `test_null_keys_get` by HexTheDragon 2021-07-06 20:58:33 -0800
  • c9ab2f3 Changes to tokener to allow null characters by HexTheDragon 2021-07-05 19:50:42 -0800
  • afade90 Edits to tests to reflect changes to API by HexTheDragon 2021-07-05 17:14:31 -0800
  • 3c0a85c Additional changes to json to contain null characters by HexTheDragon 2021-07-05 17:14:14 -0800
  • f230b25 Changes to the hash table so add works (kinda not-really) by HexTheDragon 2021-07-04 01:05:59 -0800