3party/cJSON
0
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2025-01-14 03:18:00 +08:00
Code Issues Projects Releases Wiki Activity
867 Commits 11 Branches 48 Tags 3.6 MiB
Commit Graph

867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Max Bruckner
eb8c0baa3b Add warning -Wused-but-marked-unused 2017-06-28 17:28:49 +02:00
Max Bruckner
4e0c119391 Add warning -Wmissing-variable-declarations 2017-06-28 17:28:49 +02:00
Max Bruckner
38b2f40a9a Add warning -Wunused-macro 2017-06-28 17:28:49 +02:00
Max Bruckner
d3bc571a38 Release Version 1.5.6 v1.5.6 2017-06-28 17:25:14 +02:00
Max Bruckner
48eaecd172 Merge pull request #183 from FSMaxB/null-pointer-fixes 
Null pointer fixes
 2017-06-28 16:13:56 +02:00
Max Bruckner
18ad8a8770 misc_utils_tests: call all utils function with NULL pointers 2017-06-28 16:01:20 +02:00
Max Bruckner
93227319f0 handle null pointers: cJSONUtils_GeneratePatchesCaseSensitive 2017-06-28 16:00:59 +02:00
Max Bruckner
f0c1b896ba handle null pointers: cJSONUtils_GeneratePatches 2017-06-28 16:00:41 +02:00
Max Bruckner
2d252ae595 handle null pointer: compose_patch 2017-06-28 16:00:14 +02:00
Max Bruckner
c46c4d1559 handle null pointer: sort_object 2017-06-28 15:59:53 +02:00
Max Bruckner
1af74c8cc1 handle null pointer: get_item_from_pointer 2017-06-28 15:58:58 +02:00
Max Bruckner
9bdf19fde1 handle null pointer: cJSONUtils_FindPointerFromObjectTo 2017-06-28 15:58:22 +02:00
Max Bruckner
bdd5ff7ad6 misc_tests: Call all functions with NULL pointers 2017-06-28 14:22:42 +02:00
Max Bruckner
24ea388dcf handle null pointers: cJSON_Minify 2017-06-28 14:22:36 +02:00
Max Bruckner
39745c9c75 handle null pointers: cJSON_ReplaceItemViaPointer 2017-06-28 14:22:29 +02:00
Max Bruckner
9585c38d5a handle null pointers: cJSON_CreateStringArray 2017-06-28 14:22:22 +02:00
Max Bruckner
c268e77b21 handle null pointers: cJSON_CreateDoubleArray 2017-06-28 14:22:15 +02:00
Max Bruckner
9f745a2251 handle null pointers: cJSON_CreateFloatArray 2017-06-28 14:22:07 +02:00
Max Bruckner
010e31f2f2 handle null pointers: cJSON_CreateIntArray 2017-06-28 14:21:55 +02:00
Max Bruckner
8ea37fce01 handle null pointers: replace_item_in_object 2017-06-28 14:21:48 +02:00
Max Bruckner
b2fe02712d handle null pointers: cJSON_AddItemReferenceToObject 2017-06-28 14:21:42 +02:00
Max Bruckner
c179509b31 handle null pointers: cJSON_AddItemReferenceToArray 2017-06-28 14:21:34 +02:00
Max Bruckner
46c4f55c94 handle null pointers: cJSON_AddItemToObjectCS 2017-06-28 14:21:26 +02:00
Max Bruckner
90ff72c8bb handle null pointers: create_reference 
Also fixes a potential memory leak
 2017-06-28 14:21:09 +02:00
Max Bruckner
e9d1de24cf handle null pointers: cJSON_GetArraySize 2017-06-28 14:20:58 +02:00
Max Bruckner
56f2bc6f3e handle null pointers: cJSON_PrintPreallocated 2017-06-28 14:20:47 +02:00
Max Bruckner
cdc35ebf88 handle null pointers: cJSON_AddItemToObject 2017-06-28 14:20:34 +02:00
Max Bruckner
90a46eaccd cJSON.h: Move cJSON_ParseWithOpts after cJSON_Parse 2017-06-27 23:10:19 +02:00
Max Bruckner
2a3a313f83 cJSON_PrintBuffered: Fix potential memory leak 2017-06-27 23:10:19 +02:00
Max Bruckner
a2a2411b12 Release version 1.5.5 v1.5.5 2017-06-14 18:07:25 +02:00
Max Bruckner
03ba72faec cJSON_Compare: Fix comparison of objects 
It did consider two arrays equal if one is a subset of te other one,
which is incorrect.

See #180
 2017-06-14 17:48:56 +02:00
Max Bruckner
569aa060c6 cJSON_Compare: Fix comparison of arrays 
It did consider two arrays equal if one is a prefix of the other one,
which is incorrect.

See #180
 2017-06-14 17:48:56 +02:00
Max Bruckner
b9cc911831 cJSON_Utils: Fix case sensitivity handling when adding to object 2017-06-14 17:48:56 +02:00
Max Bruckner
9abe75e072 cJSON_Utils: Fix get_item_from_pointer 
Accessing nested arrays didn't work as intended.
 2017-06-14 17:48:55 +02:00
Max Bruckner
9189b3322a Release v1.5.4 v1.5.4 2017-06-04 21:31:45 +02:00
Max Bruckner
bfbd8fe0d8 tests/parse_hex4: Fix GCC 7 compiler warning (fixes #179) 2017-06-04 21:29:14 +02:00
Max Bruckner
38b44a298d Squashed 'tests/unity/' changes from f96c055..3b69bea 
3b69bea Merge pull request #284 from rmja/patch-1
aef3679 Fixed UNITY_TEST_ASSERT_EACH_EQUAL_*

git-subtree-dir: tests/unity
git-subtree-split: 3b69beaa58efc41bbbef70a32a46893cae02719d
 2017-06-04 19:36:46 +02:00
Max Bruckner
82295f9e4f Update Unity 2017-06-04 19:36:46 +02:00
Max Bruckner
00d5e225a6 Release version 1.5.3 v1.5.3 2017-05-22 22:59:32 +02:00
Max Bruckner
9ecc96878f fix #174: cJSON_ReplaceItemInObject doesn't copy name 2017-05-22 22:55:05 +02:00
Max Bruckner
3efee9fda8 CONTRIBUTORS: Dōngwén Huáng: Add Tones to Pin Yin 2017-05-11 10:16:08 +02:00
Max Bruckner
71a7b64860 README: Small improvements 2017-05-11 10:11:43 +02:00
Max Bruckner
ddf268b074 cJSON.h: Document cJSON_ArrayForEach for objects 2017-05-10 13:17:38 +02:00
Max Bruckner
de5df3e56f Release version 1.5.2 v1.5.2 2017-05-10 02:25:25 +02:00
Max Bruckner
a167d9e381 Fix reading buffer overflow in parse_string 2017-05-10 02:09:01 +02:00
Max Bruckner
b537ca70a3 old_utils_tests: Remove leftover unused attribute 2017-05-10 01:15:28 +02:00
Max Bruckner
186cce3ece Fix -Wcomma 2017-05-10 00:52:33 +02:00
Max Bruckner
6c9f76c100 Release version 1.5.1 v1.5.1 2017-05-06 08:42:59 +02:00
Max Bruckner
2c9947eec9 CONTRIBUTORS.md: Add prefetchnta 2017-05-06 08:40:38 +02:00
Max Bruckner
9a85c26161 Merge pull request #166 from prefetchnta/patch-1 
cJSON_Utils: free() to cJSON_free()
 2017-05-06 08:18:37 +02:00
crhackos
c0088e1ebe free() to cJSON_free() 2017-05-06 12:38:10 +08:00
Max Bruckner
8738160e16 CONTRIBUTORS.md: Add Julián Vásquez 2017-05-04 00:17:20 +02:00
Max Bruckner
eb6dd6ef6b Merge pull request #164 from juvasquezg/master 
Makefile: GCC version guard for -fstack-protector-strong
 2017-05-03 23:08:24 +02:00
julianvasquez
98fb2c9437 validate gcc version for use -fstack-protector-strong in the Makefile 2017-05-03 11:07:07 -05:00
Max Bruckner
1217ca9e9f Release version 1.5.0 v1.5.0 2017-05-02 02:34:55 +02:00
Max Bruckner
6e9c6edd91 Update Changelog to 1.5.0 2017-05-02 02:33:00 +02:00
Max Bruckner
2d6a2e0133 Merge branch 'develop' prepare v1.5.0 2017-05-02 02:30:26 +02:00
Max Bruckner
d9b23039b8 CONTRIBUTORS.md: Add Mike Robinson 2017-05-02 02:22:19 +02:00
Max Bruckner
ffb877c94a Squashed 'tests/json-patch-tests/' changes from 5405313..0dd0fbc 
0dd0fbc tests.json: Test case sensitivity
01348ad tests.json: Remove trailing whitespace

git-subtree-dir: tests/json-patch-tests
git-subtree-split: 0dd0fbc5ec7eb9dab362fab47e08419079d5675e
 2017-05-02 01:56:12 +02:00
Max Bruckner
a01267c0a4 Update json-patch-tests 2017-05-02 01:56:12 +02:00
Max Bruckner
e1f6470dae json_patch_tests.c: Use case sensitive functions 2017-05-02 01:54:49 +02:00
Max Bruckner
1d277eb99d README.md: Case sensitivity caveat 2017-05-02 01:48:14 +02:00
Max Bruckner
9857ab9835 Merge pull request #159 from DaveGamble/utils-refactor 
Refactor cJSON_Utils and add case sensitive versions of all functions
 2017-05-02 01:41:50 +02:00
Max Bruckner
66f75619d9 Add cJSONUtils_MergePatchCaseSensitive 2017-05-02 01:30:58 +02:00
Max Bruckner
7f22948eec Add cJSONUtils_SortObjectCaseSensitive 2017-05-02 01:30:58 +02:00
Max Bruckner
b674519695 Add cJSONUtils_GenerateMergePatchCaseSensitive 2017-05-02 01:30:58 +02:00
Max Bruckner
94057fb069 Add cJSONUtils_ApplyPatchesCaseSensitive 2017-05-02 01:30:58 +02:00
Max Bruckner
3bf2913634 Add cJSONUtils_GeneratePatchesCaseSensitive 2017-05-02 01:30:58 +02:00
Max Bruckner
cd4d7b9b6e Add cJSONUtils_GetPointerCaseSensitive 2017-05-02 01:30:58 +02:00
Max Bruckner
73823c4b6d Add get_object_item: configurable case_sensitivity 2017-05-02 01:30:58 +02:00
Max Bruckner
0aaef1a8fa sort_list: configurable case sensitivity 2017-05-02 01:30:58 +02:00
Max Bruckner
e88be8681d create_patches: Configurable case sensitivity 2017-05-02 01:30:58 +02:00
Max Bruckner
222686513e apply_patch: configurable case sensitivity 2017-05-02 01:30:58 +02:00
Max Bruckner
62b08f1336 compare_json: configurable case sensitivity 2017-05-02 01:30:58 +02:00
Max Bruckner
7de847eeea detach_path: Configurable case sensitivity 2017-05-02 01:30:58 +02:00
Max Bruckner
af9c76e37e Add get_item_from_pointer: Configurable case sensitivity 2017-05-02 01:30:58 +02:00
Max Bruckner
2f33e8ec9b Add compare_pointers: Configurable case sensitivity 2017-05-02 01:30:58 +02:00
Max Bruckner
30906a01c0 another compare_strings fix 2017-05-02 01:30:58 +02:00
Max Bruckner
eb017abe72 fix update fix 2017-05-02 01:30:58 +02:00
Max Bruckner
487a8b76a1 fix another compare_strings 2017-05-02 01:30:58 +02:00
Max Bruckner
1d85450883 fix configurable compare_stirings 2017-05-02 01:30:58 +02:00
Max Bruckner
2616db9e92 Add compare_strings: configurable case_sensitivity 2017-05-02 01:30:58 +02:00
Max Bruckner
23cbb173d4 cJSONUtils_SortList -> sort_list 2017-05-02 01:30:58 +02:00
Max Bruckner
a29c468b68 cJSON_CompareToPatch -> create_patches 2017-05-02 01:30:58 +02:00
Max Bruckner
1d65f33d3d cJSONUtils_GeneratePatch -> compose_patch 2017-05-02 01:30:58 +02:00
Max Bruckner
997ca129a2 cJSONUtils_ApplyPatch -> apply_patch 2017-05-02 01:30:58 +02:00
Max Bruckner
cf1770b0ea cJSONUtils_Compare -> compare_json 2017-05-02 01:30:58 +02:00
Max Bruckner
aefe2f85ab cJSONUtils_PatchDetach -> detach_path 2017-05-02 01:30:58 +02:00
Max Bruckner
7f645de322 cJSONUtils_InplaceDecodePointerString -> decode_pointer_inplace 2017-05-02 01:30:58 +02:00
Max Bruckner
e6c239db2b cJSONUtils_PointerEncodedstrcpy -> encode_string_as_pointer 2017-05-02 01:30:58 +02:00
Max Bruckner
f4d9e2e1a1 cJSON_strcasecmp -> case_insensitive_strcmp 2017-05-02 01:30:58 +02:00
Max Bruckner
e3ed64d56e cJSON_PointerEncodedstrlen -> pointer_encoded_length 2017-05-02 01:30:58 +02:00
Max Bruckner
6b01dee7ca Rename cJSONUtils_Pstrcasecmp to case_insensitive_pointer_comparison 
Also changes the return type to cJSON_bool
 2017-05-02 01:30:58 +02:00
Max Bruckner
b73881a388 cJSON_Utils: Add true/false 2017-05-02 01:30:58 +02:00
Max Bruckner
bb2f868126 refactor cJSONUtils_GenerateMergePatch 2017-05-02 01:30:58 +02:00
Max Bruckner
11b8a8cd76 refactor cJSONUtils_MergePatch 2017-05-02 01:30:58 +02:00
Max Bruckner
01d656bebc refactor cJSONUtils_SortObject 2017-05-02 01:30:58 +02:00
Max Bruckner
7bf62ff4dc refactor cJSONUtils_SortList 2017-05-02 01:30:58 +02:00
Max Bruckner
f030058183 refactor cJSONUtils_GeneratePatches 2017-05-02 01:30:58 +02:00
Max Bruckner
a67c24c451 refactor cJSONUtils_CompareToPatch 2017-05-02 01:30:58 +02:00