Commit Graph

  • 53e9dd848f add the loop key length macro for circular reference detect allen 2019-09-16 15:50:59 +08:00
  • 63fb81faa5 add loop check in json deep copy #457 allen 2019-08-12 11:17:25 +08:00
  • a1f297aa83 Merge pull request #489 from AllenX2018/master Corey Farrell 2019-08-09 04:37:06 -04:00
  • e68c5ea0b5 Update CMakeLists.txt Allen 2019-08-09 15:41:57 +08:00
  • af66d3f4c0 Merge pull request #487 from cmeister2/cmeister2/ossfuzzcorpus Corey Farrell 2019-07-26 09:43:44 -04:00
  • a6f6ec1856 Merge pull request #485 from cmeister2/cmeister2/fuzzerdiags Corey Farrell 2019-07-26 08:58:16 -04:00
  • 287b5acb07 ossfuzz: Zip up all "input" files to use as a seed corpus Max Dymond 2019-07-24 19:41:45 +01:00
  • 3858607be0 Depending on the dump_mode byte, dump out as a string or as a callback. Max Dymond 2019-07-24 19:14:17 +01:00
  • 0ed750a7ea Merge pull request #486 from cmeister2/cmeister2/osstravis Corey Farrell 2019-07-24 13:46:24 -04:00
  • 7feae084b1 Use the correct branch for OSS Fuzz as well. Max Dymond 2019-07-24 10:50:21 +01:00
  • a6f436fefc Ensure OSS fuzz travis builds work for PRs Max Dymond 2019-07-24 10:39:35 +01:00
  • 66dec35c8c ossfuzz: Improvements to json_load_dump_fuzzer Max Dymond 2019-07-24 10:10:24 +01:00
  • 1ac79b2558 Merge pull request #484 from cmeister2/cmeister2/fixossafl Corey Farrell 2019-07-22 06:40:34 -04:00
  • 6e26599980 One byte fix to fix OSS Fuzz AFL support Max Dymond 2019-07-22 11:23:54 +01:00
  • 3bfa3f1946 Merge pull request #480 from cmeister2/cmeister2/ossfuzz Corey Farrell 2019-07-22 05:29:22 -04:00
  • 813c3e2c47 Merge pull request #483 from AllenX2018/master Corey Farrell 2019-07-22 04:19:26 -04:00
  • c49fbc7082 correct spelling mistake allen 2019-07-22 11:00:31 +08:00
  • 24cc9dd078 Move ossfuzz directory and use Makefile.am Max Dymond 2019-07-18 14:49:07 +01:00
  • 100e5549b6 Create a fuzzing target for jansson Max Dymond 2019-06-28 13:22:51 +01:00
  • b333f3656d Merge pull request #465 from seanbright/jansson-version Corey Farrell 2019-03-13 08:24:41 -04:00
  • 76300601d9 Add runtime version checking functions Sean Bright 2019-03-08 12:57:59 -05:00
  • f4498d2856 CHANGES: Fix 2.12 release date origin/2.12 Petri Lehtinen 2018-11-26 10:59:06 +02:00
  • 71c4e8ec21 Merge pull request #448 from coreyfarrell/2.12 v2.12 Petri Lehtinen 2018-11-26 09:10:04 +01:00
  • 10afd33efb jansson 2.12 Corey Farrell 2018-11-25 03:37:51 -05:00
  • 2a31c4f475 Merge pull request #447 from vsoch/update/install-readme Corey Farrell 2018-11-25 02:40:09 -05:00
  • f44c137a84 extra comma! vsoch 2018-11-24 23:29:14 -08:00
  • 7197810714 small updates to README vsoch 2018-11-24 23:27:23 -08:00
  • 4ba5c7cc5d Merge pull request #445 from coreyfarrell/fix-444 Corey Farrell 2018-11-08 16:00:32 -05:00
  • e262ea5fcd Remove inappropriate jsonp_free which caused segmentation fault. Corey Farrell 2018-11-05 16:43:10 -05:00
  • 6ac0eefed0 Merge pull request #436 from edgale/warnings Corey Farrell 2018-10-17 06:29:47 -04:00
  • 226b34d546 fixed extra bracket Maximilian Röhrle 2018-10-15 07:05:02 +02:00
  • d115953347 removed explicit casts Maximilian Röhrle 2018-10-15 06:58:19 +02:00
  • 15f77c8f47 Merge pull request #439 from coreyfarrell/codecoverage Corey Farrell 2018-09-29 15:37:56 -04:00
  • ef080d17b5 Fix code coverage ignored paths. Corey Farrell 2018-09-29 14:36:54 -04:00
  • 4f91b1d072 Merge pull request #438 from coreyfarrell/issue-437 Corey Farrell 2018-09-28 14:47:33 -04:00
  • 8d659113d5 More work on json_pack error reporting. Corey Farrell 2018-09-25 17:34:25 -04:00
  • 5df5fc5b13 json_pack: Improve handling of formats with '?' and '*'. Corey Farrell 2018-09-25 14:31:56 -04:00
  • e65a490c44 Merge pull request #435 from edgale/master Petri Lehtinen 2018-09-04 06:25:45 +03:00
  • fc591913ac removed various warnings Maximilian Röhrle 2018-08-31 09:01:36 +02:00
  • d83d3d9172 This fixes https://github.com/akheron/jansson/issues/434 Maximilian Röhrle 2018-08-30 14:45:28 +02:00
  • 020cc26b5c Rename a varialble that shadows another one Petri Lehtinen 2018-08-12 18:25:51 +03:00
  • 360b1ef5a1 Enable -Bsymbolic-functions linker flag whenever possible Michal Privoznik 2018-08-06 07:50:35 +02:00
  • 37147b8a23 Merge pull request #423 from coreyfarrell/gcc-8 Petri Lehtinen 2018-08-02 11:26:11 +03:00
  • 8a00a56ec4 Merge pull request #424 from Crayon2000/patch-1 Petri Lehtinen 2018-07-30 13:42:05 +03:00
  • 401ece058d Merge pull request #427 from lxin/va_end Petri Lehtinen 2018-07-30 13:41:39 +03:00
  • 66e4ee795d Call va_end after va_copy in json_vsprintf Xin Long 2018-07-25 17:39:33 +08:00
  • 3e13f514ce Update copyright for 2018 Crayon 2018-07-14 16:34:33 -04:00
  • 81fe13eeed Deal with warnings under gcc 8. Corey Farrell 2018-07-14 13:24:55 -04:00
  • aed855e692 Avoid invalid memory read in json_pack() Petri Lehtinen 2018-07-09 22:26:35 +03:00
  • b59ac57617 Merge pull request #415 from palmerc/master Petri Lehtinen 2018-05-22 07:38:17 +03:00
  • 904f5c28ac CMake variable to number comparison changed to provide meaningful error message. Explicitly specify STATIC and PIC Cameron Lowell Palmer 2018-04-28 13:54:36 +02:00
  • 80cea73bf9 Merge pull request #408 from isaachier/cmake Petri Lehtinen 2018-05-18 08:08:32 +03:00
  • e28bcfeac8 Merge pull request #417 from akheron/visual-studio-15 Petri Lehtinen 2018-05-07 14:22:03 +03:00
  • fda9288b5f Update build instructions for Visual Studio Petri Lehtinen 2018-05-07 11:17:08 +03:00
  • 9ff08f6312 Also build with VS 2017 in appveyor Petri Lehtinen 2018-05-07 08:18:07 +03:00
  • dd4743a51d Merge pull request #412 from Mephistophiles/fix_defines Petri Lehtinen 2018-05-07 08:13:21 +03:00
  • 50f29f9b1a Add JSON_HAVE_SYNC_BUILTINS and JSON_HAVE_ATOMIC_BUILTINS for autoheader Maxim Zhukov 2018-03-21 10:45:30 +03:00
  • e5dbe7bb64 Merge pull request #409 from Mephistophiles/master Petri Lehtinen 2018-03-22 10:40:41 +02:00
  • 15105b66b4 Fix error handling in json_pack Maxim Zhukov 2018-03-12 17:39:04 +03:00
  • b23025d72b Merge pull request #404 from coreyfarrell/func-attrs Petri Lehtinen 2018-03-20 04:55:48 +02:00
  • 2c98c30a02 Stop using absolute paths Isaac Hier 2018-03-11 10:51:43 -04:00
  • bb71db204f Fix output file name for version config Isaac Hier 2018-03-11 10:43:38 -04:00
  • 92760bb363 Remove warning Isaac Hier 2018-03-11 10:39:49 -04:00
  • fe7873e963 Fix package version config generation Isaac Hier 2018-03-11 10:37:15 -04:00
  • a586c0654f Fix CMake include Isaac Hier 2018-03-11 10:27:48 -04:00
  • 6d7a02beb0 Clean up CMake install Isaac Hier 2018-03-11 10:24:27 -04:00
  • b70364b362 Remove absolute path references Isaac Hier 2018-03-11 10:11:09 -04:00
  • 6d1ae86e1c Fix config file Isaac Hier 2018-03-11 09:58:26 -04:00
  • a324d18940 Rename target file Isaac Hier 2018-03-11 09:52:48 -04:00
  • 44f6606df8 Rename config files Isaac Hier 2018-03-11 09:47:29 -04:00
  • d8798468c6 Upgrade CMake to 3.1 for Hunter Isaac Hier 2018-03-11 09:34:45 -04:00
  • 749bef0b6a More test coverage. Corey Farrell 2018-03-06 23:28:14 -05:00
  • e37e52549f Add warn_unused_result to strbuffer_init. Corey Farrell 2018-03-06 08:27:20 -05:00
  • ea664722d4 Build: Add JANSSON_ATTRS macro. Corey Farrell 2018-02-28 04:55:48 -05:00
  • d098c0ff86 Merge pull request #400 from coreyfarrell/branch-coverage Petri Lehtinen 2018-02-20 15:39:36 +02:00
  • 2d494c169f Merge pull request #398 from coreyfarrell/test-coverage Petri Lehtinen 2018-02-20 15:39:19 +02:00
  • a5af280bac Enable branch coverage reporting. Corey Farrell 2018-02-20 03:09:03 -05:00
  • 73c22de516 Improve test coverage. Corey Farrell 2018-02-13 04:35:37 -05:00
  • 6dddf687d8 Merge pull request #396 from coreyfarrell/2.11 v2.11 origin/2.11 Petri Lehtinen 2018-02-11 20:11:41 +02:00
  • 744fe5ed44 jansson 2.11 Corey Farrell 2018-02-09 12:31:18 -05:00
  • 03620980cf Merge pull request #395 from akheron/doc-utf-8 Petri Lehtinen 2018-02-09 10:10:34 +02:00
  • 248d62111c Merge pull request #368 from AmeyaVS/cmake_build_fix Petri Lehtinen 2018-02-09 09:45:36 +02:00
  • 46dff2737d Merge pull request #381 from phst/end-of-file-error-code Petri Lehtinen 2018-02-09 09:40:42 +02:00
  • fa0b5ece9e Merge pull request #380 from phst/doc-error-code Petri Lehtinen 2018-02-09 09:39:38 +02:00
  • a6138a07b6 Document encoding requirements for callbacks origin/doc-utf-8 Petri Lehtinen 2018-02-09 09:33:41 +02:00
  • 2863dde053 Merge pull request #393 from akheron/json_sprintf Petri Lehtinen 2018-02-09 08:15:16 +02:00
  • efe6c7b3f2 Add json_sprintf and json_vsprintf origin/json_sprintf Petri Lehtinen 2018-02-08 20:52:10 +02:00
  • 3e81f78366 Merge pull request #389 from coreyfarrell/threadsafety Petri Lehtinen 2018-02-08 20:19:07 +02:00
  • 8104ce167a Merge pull request #1 from akheron/threadsafety Corey Farrell 2018-02-08 11:58:30 -05:00
  • f44921e176 Clarify thread safety docs, rename JANSSON_THREAD_SAFE origin/threadsafety Petri Lehtinen 2018-02-08 12:38:14 +02:00
  • 3aee856d7b Docs: Update information on thread safety. Corey Farrell 2018-01-22 19:37:36 -05:00
  • 37e0ee4d48 json_dump: Fix thread safety issue. Corey Farrell 2018-01-22 15:39:58 -05:00
  • dc3b313e91 Use thread-safe reference counting if supported by the compiler. Corey Farrell 2018-01-22 14:50:37 -05:00
  • 45228cada4 Use a more specific error code for premature end of input Philipp Stephani 2017-12-20 18:27:04 +01:00
  • 24d45272a7 document that json_error_code will be added in version 2.11 Philipp Stephani 2017-12-18 23:50:17 +01:00
  • 9e5af7c3b7 Merge pull request #374 from coreyfarrell/always-steal Petri Lehtinen 2017-12-16 20:35:14 +02:00
  • 6c78910011 apiref: Clarify documentation for unpack O format. Corey Farrell 2017-11-14 23:15:53 -05:00
  • 89dad8959b json_object_iter_set_new: Fix error branch leak. Corey Farrell 2017-11-14 22:44:48 -05:00
  • 9a1d9c88fc json_pack: Enable more complete stealing of references. Corey Farrell 2017-11-06 22:48:50 -05:00
  • 02dade46c0 Merge pull request #375 from phniix/373_upstream_typo_in_cmakelists Petri Lehtinen 2017-12-13 07:08:25 +02:00