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

908 Commits

Author SHA1 Message Date
Max Bruckner 93688cbe72
Merge pull request #344 from DaveGamble/release-1.7.11 
Release 1.7.11
 2019-04-15 00:17:19 +02:00
Max Bruckner 6b249213dd Fix clang -Wcomma warning 2019-04-15 00:06:35 +02:00
Max Bruckner 09ebae8149 Release cJSON 1.7.11 2019-04-14 23:58:02 +02:00
Max Bruckner a43fa56a63 Rewrite cJSON_Minify, fixing buffer overflows, fixes #338 
Also first tests for cJSON_Minify.
Thanks @bigric3 for reporting
 2019-04-14 23:18:48 +02:00
Max Bruckner 5a52eaddfd Undef true and false first, fixes #339 
Thanks  @raiden00pl for reporting
 2019-04-13 01:44:23 +02:00
Max Bruckner c69134d017 Release Version 1.7.10 2018-12-20 18:15:05 +01:00
Max Bruckner 563d861f92 cJSON_Utils: sort_lists: Properly split the lists 
Since `prev` is not used anymore after that by the algorithm it should
have been fine anyways, still splitting it correctly in the first place
is probably a good idea.
Thanks @andysCaplin for the fix!
 2018-12-20 18:12:23 +01:00
Max Bruckner 6820448db5 libcjson.pc.in: Use Libs.private instead of Private 
Thanks @shiluotang
 2018-12-20 18:04:52 +01:00
Max Bruckner d44b594ab3 Add missing changelog entry 2018-12-16 11:21:35 +01:00
Max Bruckner f110bd2e58 Release Version 1.7.9 2018-12-16 11:17:20 +01:00
Max Bruckner 5cd1dabb30 Add yuta-oxo to the Contributors 2018-12-16 11:16:31 +01:00
Max Bruckner d606cbbc64
Merge pull request #317 from yuta-oxo/fix_sort_list 
fix bug: sort_list() returns strange results
 2018-12-16 11:10:06 +01:00
Max Bruckner be749d7efa Fix crash of cJSON_GetObjectItemCaseSensitive when calling it on arrays 2018-12-16 11:06:40 +01:00
yuta-oxo eaec82c3c5 fix bug: sort_list() returns strange results 2018-12-12 15:09:53 +09:00
Max Bruckner cb1df2f88c README: Add note about needing to free print results in examples 2018-12-03 23:07:36 +01:00
Max Bruckner 2c914c073d Gitignore: Ignore CLion directories 2018-10-14 11:52:41 +02:00
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