RepoMirrors
/
cJSON
mirror of https://github.com/DaveGamble/cJSON
1
0
Fork 0
Code Issues Releases Wiki Activity
942 Commits 11 Branches 48 Tags 9.4 MiB
Commit Graph

942 Commits

Author SHA1 Message Date
Max Bruckner 4917024741 Makefile: Fix indentation 2018-10-14 11:52:19 +02:00
Max Bruckner a3fadd44d1 Add .editorconfig 2018-10-14 11:51:56 +02:00
Max Bruckner feb05fb2fd Add Benbuck Nason to the list of contributors 2018-10-14 11:22:14 +02:00
Max Bruckner 26f38f4782
Merge pull request #307 from bnason-nf/vstudio_static_analyzer_warnings 
Fix most of the issues reported by the Visual Studio code analysis tool
 2018-10-14 11:17:34 +02:00
Benbuck Nason 8e742e4869 Fix most of the issues reported by the Visual Studio code analysis tool. 2018-10-12 14:29:59 -07:00
Max Bruckner 543ab5d08a Update json-patch-tests 2018-10-11 00:30:43 +02:00
Max Bruckner e2162adeed Squashed 'tests/json-patch-tests/' changes from 99264bb..9ecd703 
9ecd703 Merge pull request #39 from mr-mixas/test-absent-from-location-for-copy-and-move-ops
66817e7 test absent 'from' location for copy and move
09dee56 Fix anonymous test
8bae8ed Fix « test should pass - no error » test
855f2a4 Fix « test should pass despite (nested) rearrangement » test
53283fc Fix « test should pass despite rearrangement » test
ecf01e7 Fix « null value should be valid obj property » test
1586cdf Fix « Empty-string element » test

git-subtree-dir: tests/json-patch-tests
git-subtree-split: 9ecd703c08cda4864cd2d2fb580a513ec5740934
 2018-10-11 00:30:43 +02:00
Max Bruckner 08103f048e Release version 1.7.8 2018-09-21 19:29:42 +02:00
Max Bruckner ace800e444 Update changelog for 1.7.8 2018-09-21 19:28:25 +02:00
Max Bruckner 00544a4a74 Contributors: Add Zach Hindes 2018-09-21 19:26:01 +02:00
Max Bruckner 3550a5553d
Merge pull request #295 from zhindes/master 
Support default __stdcall calling convention (/Gz) on Windows
 2018-09-21 19:23:31 +02:00
Zach Hindes d9fe34bade Add newline to end of unity_setup.c 2018-09-17 09:10:20 -05:00
Zach Hindes f25b8448e4 Support default __stdcall calling convention on tests as well 2018-09-12 15:32:30 -05:00
Zach Hindes ad2cb5b7ea Enable build and test on Windows 2018-09-04 14:36:21 -05:00
Zach Hindes f32703a7a1 Support default __stdcall calling convention (/Gz) on Windows 2018-08-29 16:25:46 -05:00
Max Bruckner 86234db095 Release cJSON v1.7.7 2018-05-21 22:08:21 +02:00
Max Bruckner af5b4911de Fix memory leak if realloc returns NULL 
Thanks @AlfieDeng for reporting
 2018-05-21 22:00:07 +02:00
Max Bruckner 787d651e81 Contributors: Add Zhao Zhixu 2018-05-08 21:33:33 +02:00
Max Bruckner 1571a3ebe4
Merge pull request #266 from zhaozhixu/master 
fix a typo in cJSON.h
 2018-05-08 21:31:00 +02:00
Zhao Zhixu 0d5ecc11b6 fix typo 2018-05-08 22:45:14 +08:00
Max Bruckner 529ec06abb Makefile: Fix #263, use $(CC) instead of 'gcc' for detecting the version 2018-04-29 09:20:08 +02:00
Max Bruckner 3349978268 cJSON.c: Remove unnecessary include of float.h, fix #259 2018-04-26 23:58:51 +02:00
Max Bruckner cbc05de76f Release version 1.7.6 2018-04-13 12:32:30 +08:00
Max Bruckner 7996a4a2ee Readme: Deprecate the Makefile 2018-04-13 12:12:26 +08:00
Max Bruckner ed8fefc9ca Makefile: Fix #252, put soname in the ELF file 2018-04-13 12:03:33 +08:00
Max Bruckner e6869c2e03 cJSON_Utils.h: Add include guards and extern C for C++ 2018-04-13 10:32:29 +08:00
Max Bruckner 0e0c463491 Release version 1.7.5 2018-03-22 20:29:17 +01:00
Max Bruckner 2336a0348d Contributors: Add Bob Kocisko 2018-03-22 20:28:54 +01:00
Max Bruckner 5d50f4efe1 Contributors: Thank all the non-code contributors 2018-03-22 20:28:30 +01:00
Max Bruckner 8abf110750
Merge pull request #251 from bobkocisko/master 
json patch: adding to a subfield of a non-object now fails as expected
 2018-03-22 20:00:24 +01:00
Bob Kocisko d26a42af8d json patch: adding to a subfield of a non-object now fails as expected 2018-03-22 11:10:29 -04:00
Max Bruckner 6f264b5d0c
Merge pull request #249 from DaveGamble/fix-add-item 
Release 1.7.4
 2018-03-02 20:04:29 +01:00
Max Bruckner 5da9edc8b1 Release version 1.7.4 2018-03-02 19:57:36 +01:00
Max Bruckner 22a7d04fa0 add_item_to_object: Fix use-after-free when string is aliased 
If the `string` property of the item that is added is an alias to the
`string` parameter of `add_item_to_object`, and `constant` is false,
`cJSON_strdup` would access the string after it has been freed.

Thanks @hhallen for reporting this in #248.
 2018-03-02 19:49:55 +01:00
Max Bruckner a559eac472 Release version 1.7.3 2018-02-07 21:16:35 +01:00
Max Bruckner d514bb866e Fix #241, potential double free 2018-02-07 19:36:59 +01:00
Max Bruckner 27caa364b0 Release version 1.7.2 2018-02-06 11:38:41 +01:00
Max Bruckner f47271f455 Fix pkgconfig and installation. Thanks @zeerd for reporting 
CMAKE_INSTALL_FULL_... needs to be used.
 2018-02-06 11:24:03 +01:00
Max Bruckner 7cc52f6035
Merge pull request #231 from DaveGamble/fixes 
Release Version 1.7.1
 2018-01-09 22:34:48 +01:00
Max Bruckner b60b5d3744 Update version to 1.7.1 2018-01-09 21:59:42 +01:00
Max Bruckner 4d84acf926 print_number: fix Off-By-One error 
Thanks @liuyunbin for reporting this in #230
 2018-01-09 21:40:55 +01:00
Max Bruckner 28d4410f42 print: fix: realloc was allocating too much memory 
Thanks @liuyunbin for reporting this in #230
 2018-01-09 20:53:33 +01:00
Max Bruckner f33fa95f3d print: Fix default buffer size in printbuffer 
Thanks @liuyunbin for reporting this in #230
 2018-01-09 20:49:03 +01:00
Max Bruckner 984dc85a5f
Merge pull request #228 from DaveGamble/develop 
Release Version 1.7.0
 2017-12-31 02:20:27 +01:00
Max Bruckner 13a2d337a8 Update version number to 1.7 2017-12-31 02:03:40 +01:00
Max Bruckner 17b83e76e9 Update Changelog for version 1.7 2017-12-31 02:01:53 +01:00
Max Bruckner 43754e7833
Merge pull request #215 from DaveGamble/new-documentation 
New documentation
 2017-12-31 01:43:11 +01:00
Max Bruckner 1e95363638 README: Caveats: Duplicate object members 2017-12-31 01:40:57 +01:00
Max Bruckner d7e711c0de README: new doc: Add links for 4th level sections 2017-12-31 01:35:09 +01:00
Max Bruckner f26d8f3175 README: Add small note about CMake on Windows. 2017-12-31 01:35:09 +01:00