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

764 Commits

Author SHA1 Message Date
Max Bruckner 3fe72cf2b8 fuzzing: afl.c: Fix printing usage 2017-03-02 23:57:05 +01:00
Max Bruckner d8d0ae66d3 print_number: Fix incorrect output pointer 2017-03-02 23:57:01 +01:00
Max Bruckner 9d07917feb utf16_literal_to_utf8: Eliminate Duff's Device 
This fixes -Wimplicit-fallthrough warnings with GCC7.
 2017-03-02 13:46:31 +01:00
Max Bruckner 2c45ad7816 Squashed 'tests/unity/' changes from 2988e98..1f52255 
1f52255 Merge pull request #267 from FSMaxB/fix-wconversion
7bce0b4 Fix warning with ubsan and -Wconversion
b5da224 Merge pull request #266 from FSMaxB/fix-double-promotion
1bf22d3 Fix warnings with -Wdouble-promotion

git-subtree-dir: tests/unity
git-subtree-split: 1f522558a6c4577aa937341bf856ba3b1436768a
 2017-03-01 23:20:30 +01:00
Max Bruckner ad5abf4c5b Update unity with fixes for compiler warnings 2017-03-01 23:20:30 +01:00
Max Bruckner 6405fd15e3 CMake: Set default visibility to hidden and dllexport on windows 2017-03-01 23:19:35 +01:00
Max Bruckner b44c917be9 tests/common: use CJSON_PUBLIC 2017-03-01 23:16:19 +01:00
Max Bruckner 2d3520e0b9 Use own cJSON_bool boolean type in the header 2017-03-01 22:50:12 +01:00
Max Bruckner 2e118df0cd tests/common.h: Remove unused prototype 2017-03-01 22:47:45 +01:00
Max Bruckner 412f4f7d62 Use CJSON_PUBLIC for typecheck functions 2017-03-01 22:47:45 +01:00
Max Bruckner 0aea75fbda Merge pull request #123 from DaveGamble/trim-numbers 
Remove traling zeroes when printing floating point numbers
 2017-03-01 18:38:48 +01:00
Max Bruckner 0c0dd4a5b0 tests: test trim_trailing_zeroes 2017-03-01 18:29:01 +01:00
Max Bruckner dd4cb5400f print_number: Remove unnecessary integer handling 2017-03-01 13:28:27 +01:00
Max Bruckner 1ea72f8260 print_number: Remove trailing zeroes (for doubles) 2017-03-01 13:22:32 +01:00
Max Bruckner e78bc42362 print_number: Return buffer + offset instead of beginning of the number 2017-03-01 13:00:52 +01:00
Max Bruckner 6f271e511f print_number: Use sprintf's return value 
This is used to update the buffer offset and determine success
 2017-03-01 12:56:32 +01:00
Max Bruckner bee069b4e7 Merge pull request #122 from DaveGamble/more-compiler-flags 
Add more compiler flags
 2017-03-01 12:30:12 +01:00
Max Bruckner 1e0bd24f2c Revert "unity: make it work with -Wconversion" 
This reverts commit 12acc57967.
 2017-03-01 11:57:07 +01:00
Max Bruckner 5cf56fa4fa Add -Wparentheses compile option 2017-03-01 11:57:07 +01:00
Max Bruckner 3f349a4258 Add -Wdouble-promotion compiler flag 2017-03-01 11:57:07 +01:00
Max Bruckner 40e3781e9b CMake: Disable -Werror for Unity 2017-03-01 11:57:07 +01:00
Max Bruckner b056d7cb74 Add -Wcomma compiler flag 2017-03-01 11:57:06 +01:00
Max Bruckner 1f422b586a Squashed 'tests/unity/' changes from 1782bab..2988e98 
2988e98 Merge pull request #262 from codehearts/patch-2
1732698 Fixed incorrect TEST_PROTECT explanation in readme
3817375 Merge pull request #260 from jeremyhannon/parseUnityFixtureOutputToJUnitFormat
9d5159f Merge pull request #261 from codehearts/patch-1
65ce727 Fixed typo for TEST_PROTECT in readme
4dc04d3 Enhance parseOutput.rb to support Unity fixture output

git-subtree-dir: tests/unity
git-subtree-split: 2988e980fbc2252fa4290b608517d4ae25cd9a46
 2017-03-01 09:23:18 +01:00
Max Bruckner 899529e866 Update unity 2017-03-01 09:23:18 +01:00
Max Bruckner 2837aac23e Contributors: Add Mike Jerris 2017-02-28 23:04:29 +01:00
Max Bruckner c66d95d116 Release bugfix release 1.3.2 2017-02-28 21:43:02 +01:00
Max Bruckner cb6df3ffad Merge pull request #121 from ffontaine/master 
Do not build unity library if tests are disabled
 2017-02-28 21:34:29 +01:00
Fabrice Fontaine 695d8a01a9 Do not build unity library if tests are disabled 
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 2017-02-28 20:48:04 +01:00
Max Bruckner 024f690289 Merge pull request #116 from mjerris/fschanges 
add CJSON_DECLARE macros to support gcc visibility and windows dllexport
 2017-02-27 21:51:55 +01:00
Mike Jerris 039b1cc653 add CJSON_PUBLIC macro to public functions to support visibility and dllimport/dllexport 2017-02-27 13:47:06 -06:00
Max Bruckner c0ff1fef9b Release 1.3.1 2017-02-26 22:04:22 +01:00
Max Bruckner 2302f4f0b2 Merge pull request #120 from DaveGamble/typecheck-functions 
Typecheck functions
 2017-02-26 22:00:28 +01:00
Max Bruckner c45dc12fd7 Tests for typecheck functions 2017-02-26 21:54:01 +01:00
Max Bruckner ed8dc53699 cJSON_Utils: Use new typecheck functions 2017-02-26 21:26:34 +01:00
Max Bruckner c26d53f0d7 Helper function to check the type of an item 
This is necessary, because you can get it wrong if you do it manually.
(when you forget the & 0xFF in the comparison)
 2017-02-26 14:30:50 +01:00
Max Bruckner 29f312dd69 Merge pull request #118 from mjerris/parser 
prevent read beyond end of buffer when string ends with malformed utf
 2017-02-26 13:12:26 +01:00
Mike Jerris 72e6e23523 prevent read beyond end of buffer when string ends with malformed utf 2017-02-23 08:59:25 -06:00
Max Bruckner 501046247d fix clang-sanitizer warnings 2017-02-21 15:08:36 +01:00
Max Bruckner 68cd0d4a11 cJSON.c: Pass allocation functions through internal functions 
This is the first step in removing the global allocator functions. Every
internal function now only accesses its locally available set of
allocators.
 2017-02-21 14:50:49 +01:00
Max Bruckner 56b819bfbc tests: test cJSON_GetObjectItem and cJSON_GetObjectItemCaseSensitive 2017-02-21 11:17:08 +01:00
Max Bruckner 605422c60a cJSON: New function cJSON_GetObjectItemCaseSensitive 2017-02-21 11:17:08 +01:00
Max Bruckner cbbcc91498 tests: cJSON_ArrayForEach 2017-02-21 09:17:49 +01:00
Max Bruckner b47d0e34ca cJSON_ArrayForEach: Fix handling of NULL pointers 2017-02-21 09:17:34 +01:00
Max Bruckner bc12c69b54 Merge pull request #114 from DaveGamble/simplify-print 
Simplify print functions
 2017-02-20 23:09:06 +01:00
Max Bruckner 1d42c9bc60 print_object: simplify code 2017-02-20 23:07:24 +01:00
Max Bruckner b71db93e03 print_object: rename variables 2017-02-20 23:07:24 +01:00
Max Bruckner 6d5a7c8c40 print_array: simplify code 2017-02-20 23:07:24 +01:00
Max Bruckner 8c1ed3ab82 update: rename to update_offset and change offset directly 2017-02-20 23:07:24 +01:00
Max Bruckner f16dd7e028 print_array: rename variables 2017-02-20 23:07:24 +01:00
Max Bruckner 08770fc246 print_value: rename variables 2017-02-20 23:07:23 +01:00