aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2019-10-21Merge pull request #498 from AllenX2018/fix-issue441Petri Lehtinen1-7/+0
fix issue #441: remove strtod definition in strconv.c
2019-10-21remove undef __NO_ISOCEXT for strtod compatiblitywillson-chen1-3/+0
2019-10-18Merge pull request #499 from AllenX2018/fix-issue281Petri Lehtinen3-0/+105
Add json_object_update_new, json_object_update_existing_new and json_object_update_missing_new
2019-10-17Merge branch 'master' into fix-issue281Petri Lehtinen17-50/+239
2019-10-17Merge pull request #505 from AllenX2018/recursive_object_updatePetri Lehtinen5-3/+148
Recursive object update
2019-10-17Merge pull request #500 from AllenX2018/fix-issue426Petri Lehtinen1-0/+4
fix issue #426: fix pipe function in MinGW
2019-10-17Merge pull request #501 from AllenX2018/fix-issue481Petri Lehtinen4-24/+24
fix issue #481
2019-10-17Merge pull request #502 from AllenX2018/fix-issue453Petri Lehtinen1-5/+19
fix issue #453:update FindSphinx.cmake to better align with find sphinx package.
2019-10-17Merge pull request #503 from AllenX2018/loadfd-docPetri Lehtinen1-1/+5
add note for non-blocking file descriptor used for json_loadfd
2019-10-17Merge pull request #506 from AllenX2018/add-json_equal-test-casePetri Lehtinen1-4/+14
fix typo & add negative test case for test_equal_complex
2019-10-15fix typo & add negative test case for test_equal_complexallen1-4/+14
2019-10-14update the test case of json_object_update_recursiveallen1-3/+1
2019-10-12add loop check for json_object_update_recursive functionallen2-8/+75
2019-10-12modify some wordsallen1-5/+5
2019-10-11Add json_object_update_recursive()Henrique Cabral5-0/+80
Support merging values nested within objects. For instance, merging: { "foo": 1, "bar": { "baz": 2 } } with { "bar": { "baz": 3 } } results in { "foo": 1, "bar": { "baz": 3 } } instead of overwriting the value for the bar key.
2019-10-10add note for non-blocking file descriptor used for json_loadfdallen1-1/+5
2019-10-10fix issue #453AllenX20181-5/+19
2019-10-09fix issue #481allen4-24/+24
2019-10-08fix issue #281allen3-0/+105
2019-10-08fix issue #441AllenX20181-4/+0
It already has "strtod" function in stdlib.h and because __USE_MINGW_ANSI_STDIO is desperated
2019-10-08fix issue #426AllenX20181-0/+4
2019-09-27Merge pull request #496 from grdowns/vcpkg-instructionsPetri Lehtinen1-0/+12
Add vcpkg installation instructions
2019-09-26Add vcpkg installation instructionsgrdowns1-0/+12
2019-09-23Merge pull request #494 from luzpaz/typosPetri Lehtinen6-13/+13
Fix various typos
2019-09-23Merge pull request #490 from AllenX2018/masterPetri Lehtinen5-20/+115
add loop check in json deep copy #457
2019-09-20Fix various typosluz.paz6-13/+13
Found via `codespell -q 2` (v1.17.0.dev0)
2019-09-18Update apiref.rstAllen1-1/+3
fix the documentation about json_dumps. refs #471
2019-09-16add the loop key length macro for circular reference detectallen3-5/+6
2019-08-12add loop check in json deep copy #457allen4-17/+109
2019-08-09Merge pull request #489 from AllenX2018/masterCorey Farrell1-0/+7
Update CMakeLists.txt
2019-08-09Update CMakeLists.txtAllen1-0/+7
add "-Wno-format-truncation" to supress format truncation warning in cmake
2019-07-26Merge pull request #487 from cmeister2/cmeister2/ossfuzzcorpusCorey Farrell1-0/+3
ossfuzz: Zip up all "input" files to use as a seed corpus
2019-07-26Merge pull request #485 from cmeister2/cmeister2/fuzzerdiagsCorey Farrell1-8/+93
ossfuzz: Improvements to json_load_dump_fuzzer
2019-07-24ossfuzz: Zip up all "input" files to use as a seed corpusMax Dymond1-0/+3
2019-07-24Depending on the dump_mode byte, dump out as a string or as a callback.Max Dymond1-7/+34
2019-07-24Merge pull request #486 from cmeister2/cmeister2/osstravisCorey Farrell2-1/+15
Ensure OSS fuzz travis builds work for PRs
2019-07-24Use the correct branch for OSS Fuzz as well.Max Dymond1-1/+3
2019-07-24Ensure OSS fuzz travis builds work for PRsMax Dymond2-1/+13
Use the correct repository for cloning when doing a push build or a pull-request. Only do one fuzzer build!
2019-07-24ossfuzz: Improvements to json_load_dump_fuzzerMax Dymond1-6/+64
Add in diagnostics to json_load_dump_fuzzer so that if FUZZ_VERBOSE is defined in the environment, additional debug information about the current test case is output to stderr. Replace json_dumps by json_dump_callback so that memory is not exhausted by excessively nested json objects.
2019-07-22Merge pull request #484 from cmeister2/cmeister2/fixossaflCorey Farrell1-1/+1
One byte fix to fix OSS Fuzz AFL support
2019-07-22One byte fix to fix OSS Fuzz AFL supportMax Dymond1-1/+1
"x$LIB_FUZZING_ENGINE" is not the correct filename to test for - remove the x!
2019-07-22Merge pull request #480 from cmeister2/cmeister2/ossfuzzCorey Farrell10-1/+228
oss-fuzz: Create a fuzzing target for jansson
2019-07-22Merge pull request #483 from AllenX2018/masterCorey Farrell1-1/+1
correct spelling mistake
2019-07-22correct spelling mistakeallen1-1/+1
2019-07-19Move ossfuzz directory and use Makefile.amMax Dymond12-28/+99
2019-06-28Create a fuzzing target for janssonMax Dymond7-0/+156
2019-03-13Merge pull request #465 from seanbright/jansson-versionCorey Farrell8-2/+122
Add runtime version checking functions
2019-03-12Add runtime version checking functionsSean Bright8-2/+122
This patch adds two new exported functions: * `jansson_version_str` - Returns a human-readable version number * `jansson_version_cmp` - Returns an integer less than, equal to, or greater than zero if the runtime version of Jansson is found, respectively, to be less than, to match, or be greater than the provided major, minor, and micro.
2018-11-26CHANGES: Fix 2.12 release date2.12Petri Lehtinen1-1/+1
2018-11-26Merge pull request #448 from coreyfarrell/2.12v2.12Petri Lehtinen6-7/+47
jansson 2.12
generated by cgit v1.1 at 2024-08-28 10:43:17 +0000