Commit Graph

  • 9749b0cb66 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. Eric Haszlakiewicz 2022-07-30 19:27:14 +00:00
  • 2e9b7456a5 Update Travis links to point at travis-ci.com instead of travis-ci.org Eric Haszlakiewicz 2022-07-26 23:47:58 +00:00
  • 5282e73600 Entirely drop mode bits from open(O_RDONLY) to avoid warnings on certain platforms. Fixes issue #779. Eric Haszlakiewicz 2022-07-26 23:43:30 +00:00
  • 8b35a78d29 Trim a few travis builds, update others to more recent toolchains. Eric Haszlakiewicz 2022-07-24 20:37:14 +00:00
  • 22773b1e51 Fix the expected output for test_set_serializer. Eric Haszlakiewicz 2022-07-24 19:00:27 +00:00
  • 16208fc01a Add test to check for the memory leak mentioned in issue #781 Eric Haszlakiewicz 2022-07-24 18:59:26 +00:00
  • 2a2d861bc0 Merge pull request #781 from dddaniel/master Eric Hawicz 2022-07-24 14:15:42 -04:00
  • 213bb5caa1 Fix memory leak with emtpy strings in json_object_set_string Daniel Danzberger 2022-07-24 18:46:03 +02:00
  • d28ac67dde Fix issue #775 - use a loop instead of list(TRANSFORM ...) to support cmake < 3.12. Eric Haszlakiewicz 2022-06-27 02:15:24 +00:00
  • 5d98f7825a Merge pull request #776 from stoeckmann/typo Eric Hawicz 2022-06-21 21:39:00 -04:00
  • f63573460c Fix typo Tobias Stoeckmann 2022-06-21 14:39:01 +02:00
  • 6ee0a35a20 Fix #771/#768 by marking usage() as "noreturn" instead of using "FALLTHRU" in the case statement where it'd called. Eric Haszlakiewicz 2022-06-13 01:02:53 +00:00
  • 11546bfd07 Merge pull request #769 from An7ar35/issue-768 Eric Hawicz 2022-06-03 23:14:16 -04:00
  • 5d00384e0d missing 'FALLTHRU' added to sort out error messages when using "-Werror=implicit-fallthrough" flag An7ar35 2022-06-01 12:36:33 +02:00
  • 49c3721a5a Unset NDEBUG so assert() is enabled in all tests. One more fix there when building with -DCMAKE_BUILD_TYPE=release. Eric Haszlakiewicz 2022-05-30 15:39:54 +00:00
  • 2f0942bdd7 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. Eric Haszlakiewicz 2022-05-30 15:30:11 +00:00
  • 6ba1adf8ef 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. Eric Haszlakiewicz 2022-05-30 14:33:16 +00:00
  • 86b46cac07 Add --disable-static and --disable-dynamic options to the cmake-configure script. Eric Haszlakiewicz 2022-05-30 14:31:08 +00:00
  • f2fc1ca00a Note the DSIABLE_JSON_POINTER and DISABLE_EXTRA_LIBS build options on the README Eric Haszlakiewicz 2022-04-14 12:57:43 +00:00
  • acccefd770 Add a "Getting Help" section to the README. Eric Haszlakiewicz 2022-04-14 12:55:32 +00:00
  • 294efecc10 Update the doc links to point at 0.16. Drop broken link to oss.metaparadigm.com. Eric Haszlakiewicz 2022-04-14 12:36:26 +00:00
  • 76db5740f7 Add the 0.16 docs. Eric Haszlakiewicz 2022-04-14 12:34:00 +00:00
  • de5a64888a Update the master branch to version 16.99 Eric Haszlakiewicz 2022-04-14 12:29:39 +00:00
  • 7e3eba72db Clarify how to set the uploaded release tarballs to be publically readable. Eric Haszlakiewicz 2022-04-14 12:17:59 +00:00
  • 2f2ddc1f2d Generate docs for the 0.16 release json-c-0.16-20220414 json-c-0.16 Eric Haszlakiewicz 2022-04-14 01:12:43 +00:00
  • 2c6358521a Bump version to 0.16 Eric Haszlakiewicz 2022-04-14 01:10:39 +00:00
  • 7d303478a4 Update the ChangeLog with recent changes, in preparation for a 0.16 release. Add a list of issues closed for this release. Eric Haszlakiewicz 2022-04-14 00:21:13 +00:00
  • 66dcdf549e Add new authors since the 0.15 release, tweak instructions for how to update that list. Eric Haszlakiewicz 2022-04-13 23:16:34 +00:00
  • 4902f9cb87 Merge pull request #765 from jvoisin/patch-1 Eric Hawicz 2022-04-13 14:28:51 -04:00
  • 558d48a6f3 Improve a bit the coverage of the fuzzer Julien Voisin 2022-04-13 15:42:46 +02:00
  • 46b58ad9e7 Fix issue #764: adjust test_util_file to match new output (changed in 6e53347) Eric Haszlakiewicz 2022-04-08 22:58:24 +00:00
  • 0b937f6173 Merge pull request #758 from c3h2-ctf/context Eric Hawicz 2022-04-04 18:01:39 -04:00
  • 65274cf3b5 Update issue templates Eric Hawicz 2022-04-04 17:10:31 -04:00
  • 0c0d901443 Preserve context if out of memory Tobias Stoeckmann 2022-03-20 13:22:46 +01:00
  • e244146dfd Remove single quote from #error line. Fixes issue #761 Eric Haszlakiewicz 2022-03-25 01:11:52 +00:00
  • a1c092bd7b Merge pull request #760 from BonsaiYi/error Eric Hawicz 2022-03-23 00:14:36 -04:00
  • 716978f20d Code style removed unneeded double-quotes BonsaY 2022-03-21 21:10:45 +01:00
  • 9e6acc9a4e json_tokener_parse_ex: handle out of memory errors Tobias Stoeckmann 2022-03-20 17:22:07 +01:00
  • 5accae04bb json_object_from_fd_ex: fail if file is too large Tobias Stoeckmann 2022-03-20 13:17:37 +01:00
  • 79459b2de2 Merge pull request #755 from c3h2-ctf/error Eric Hawicz 2022-03-19 10:05:48 -04:00
  • 2326e34390 Merge pull request #754 from c3h2-ctf/doc Eric Hawicz 2022-03-19 10:04:58 -04:00
  • 6e533471a8 Fix error messages Tobias Stoeckmann 2022-03-19 10:59:43 +01:00
  • a7d85bfba9 Fix typos in comments Tobias Stoeckmann 2022-03-19 10:39:10 +01:00
  • cbc603b587 Adjusted URLs Tobias Stoeckmann 2022-03-19 10:34:55 +01:00
  • f0d93cee14 Merge pull request #748 from c3h2-ctf/printbuf Eric Hawicz 2022-03-07 00:06:57 -05:00
  • 9b832c8710 Merge pull request #752 from c3h2-ctf/typos Eric Hawicz 2022-03-06 23:33:42 -05:00
  • 543a8eb5f9 Fix typos Tobias Stoeckmann 2022-03-06 16:07:36 +01:00
  • 94b2a0cb29 sprintbuf(): test for all vsnprintf error values Tobias Stoeckmann 2022-02-27 21:45:28 +01:00
  • a4389f4f30 Merge pull request #749 from c3h2-ctf/sprintbuf Eric Hawicz 2022-03-03 21:32:09 -05:00
  • 4493db76d6 Merge pull request #750 from c3h2-ctf/clearmem Eric Hawicz 2022-03-03 21:29:27 -05:00
  • 1491d92038 Merge pull request #751 from c3h2-ctf/arguments Eric Hawicz 2022-03-03 21:26:22 -05:00
  • d07da04c14 sprintbuf(): handle printbuf_memappend errors Tobias Stoeckmann 2022-03-03 21:24:27 +01:00
  • 63c602ff80 printbuf_memset(): set gaps to zero Tobias Stoeckmann 2022-03-03 21:18:53 +01:00
  • 4355242477 printbuf: do not allow invalid arguments Tobias Stoeckmann 2022-03-03 21:15:19 +01:00
  • bd56cc8bf7 Merge pull request #745 from c3h2-ctf/vasprintf Eric Hawicz 2022-02-27 08:34:21 -05:00
  • 723ac8cbb5 Merge pull request #746 from rouault/typo_fixes Eric Hawicz 2022-02-26 23:45:15 -05:00
  • 3bb54f97e7 Fix typos in code comments and ChangeLog Even Rouault 2022-02-25 00:14:47 +01:00
  • 5c72257220 vasprintf(): avoid out of memory accesses Tobias Stoeckmann 2022-02-24 21:35:44 +01:00
  • 66cce0a1d7 Merge pull request #739 from rouault/avoid_unsigned_integer_overflow Eric Hawicz 2022-02-18 20:21:18 -05:00
  • b11f79c52c Merge pull request #741 from rouault/json_type_to_name_formatter Eric Hawicz 2022-02-18 20:08:31 -05:00
  • 78246db72f Merge pull request #742 from rouault/json_object_copy_serializer_data_add_assertion Eric Hawicz 2022-02-18 20:08:02 -05:00
  • a1ea216878 Merge pull request #744 from Kizuna-Meraki/close-random Eric Hawicz 2022-02-18 20:07:33 -05:00
  • d783ad76c7 Close file on error path. Kizuna-Meraki 2022-02-17 21:27:01 +01:00
  • f2c0df404b json_type_to_name(): use correct printf() formatter Even Rouault 2022-01-16 20:48:27 +01:00
  • 82d9433813 json_object_copy_serializer_data(): add assertion Even Rouault 2022-01-16 20:50:56 +01:00
  • 296db618e9 json_escape_str(): avoid harmless unsigned integer overflow Even Rouault 2022-01-12 23:43:03 +01:00
  • 3b4f1e92ad Merge pull request #737 from tniessen/patch-1 Eric Hawicz 2022-01-11 21:25:38 -05:00
  • 928fa96db7 Fix typo in README Tobias Nießen 2022-01-10 00:12:25 +01:00
  • a5c2e11460 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. Eric Haszlakiewicz 2021-12-22 02:52:37 +00:00
  • 2d2382d709 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. Eric Haszlakiewicz 2021-11-30 03:27:55 +00:00
  • 320548caf6 Drop the REFCOUNT_DEBUG code, it hasn't been used in ages. Eric Haszlakiewicz 2021-11-30 03:08:02 +00:00
  • 9a90b8477b Merge pull request #734 from json-c/newer-appveyor Eric Hawicz 2021-11-29 13:40:41 -05:00
  • 1cb56e705f Put the most recent image first in appveyor builds. Eric Haszlakiewicz 2021-11-29 18:21:05 +00:00
  • 1763edaba3 Skip most "Release" builds. s/b_config/CONFIGURATION/ to fix artifact creation. Eric Haszlakiewicz 2021-11-29 18:18:48 +00:00
  • a5fed59756 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. Eric Haszlakiewicz 2021-11-27 02:55:29 +00:00
  • 0910e18bbd Use the newer appveyor images to build for VS2017 and VS2019. Trim the number of builds we do. Eric Haszlakiewicz 2021-11-27 02:29:26 +00:00
  • f1fb9abf14 Note the need to also set CTEST_OUTPUT_ON_FAILURE to get test output Eric Haszlakiewicz 2021-11-26 22:49:06 +00:00
  • 42aa6f7257 Merge pull request #732 from DiracResearch/fix/static_include_dirs Eric Hawicz 2021-11-11 23:52:43 -05:00
  • 286b4fdd27 Fix uninitialized value error for clang-8 msan Robert Bielik 2021-11-11 10:23:05 +01:00
  • a66a6cc51b Fix for clang ub sanitizer Robert Bielik 2021-11-11 09:35:31 +01:00
  • 21f767f63f Add target include dirs for static library as well Robert Bielik 2021-11-10 16:04:01 +01:00
  • 9b0fb2b33e Merge pull request #727 from jobol/propo2 Eric Hawicz 2021-10-22 19:06:11 -04:00
  • 8bf3b45a29 Really use prefix JSON_C_OBJECT_ADD_* José Bollo 2021-10-12 14:42:12 +02:00
  • 05c5d15075 Merge pull request #729 from DeX77/patch-1 Eric Hawicz 2021-10-17 14:23:28 -04:00
  • d6d4b71d7d * don't assume includedir DeX77 2021-10-15 11:12:39 +02:00
  • 382f9462c2 Merge pull request #726 from leongross/fix/test-cmake3.1 Eric Hawicz 2021-10-09 09:17:25 -04:00
  • 8be2ffdcd7 fix cmake version for tests Leon Gross 2021-10-06 14:40:52 +02:00
  • 4fc44f32df Merge pull request #722 from imaami/fix-json_tokener_new_ex-use-after-free Eric Hawicz 2021-09-04 23:16:13 -04:00
  • 9361d8d3a8 Fix use-after-free in json_tokener_new_ex() Juuso Alasuutari 2021-09-04 20:14:30 +03:00
  • dc1ef7d566 Merge pull request #718 from Pawday/master Eric Hawicz 2021-07-31 22:46:01 -04:00
  • e91e4cc9fb Setted cmake "uninstall" target to exist in unix like operating systems only Pawday 2021-07-26 18:52:29 +03:00
  • f61f1a7a91 Add workaround for Visual Studio not knowing about "inline". Eric Haszlakiewicz 2021-07-25 20:31:59 +00:00
  • db6a6cc2b2 Switch the Travis build to use osx_image: xcode12.5, in an attempt to avoid timeouts with Homebrew. Eric Haszlakiewicz 2021-07-25 20:03:55 +00:00
  • 6a0df2609e Merge some old work to include (some of) PR #464 into the current master branch. Eric Haszlakiewicz 2021-07-25 19:07:06 +00:00
  • 8c727e5ce1 Only define an "uninstall" target if it's not already defined (e.g. by projects that include json-c) Eric Haszlakiewicz 2021-07-25 15:11:11 +00:00
  • be9671e48a Merge pull request #714 from Hex052/clang-format_AfterCaseLabel Eric Hawicz 2021-07-05 18:18:06 -04:00
  • 9dde931a1c Add AfterCaseLabel to .clang-format Hex052 2021-07-04 18:28:21 -08:00
  • 75bf657cc2 If inttypes.h is present, use it, even on Windows. Eric Haszlakiewicz 2021-06-13 21:12:22 +00:00
  • 9ca50cf2f8 Issue #709: adjust some include guards to be a bit more json-c specific. Eric Haszlakiewicz 2021-06-02 23:53:23 +00:00
  • 0b7e78c309 Merge pull request #706 from davidjmccann/master Eric Hawicz 2021-05-15 08:41:24 -04:00