Max Bruckner
b41264d164
Remove uint8_t because it's not part of C89
2017-02-16 21:22:43 +01:00
Max Bruckner
0f271dcf63
parse_hex4: make input pointer const
2017-02-16 21:02:26 +01:00
Max Bruckner
ead389aba2
parse_value: improve variable names + const correctness
2017-02-16 21:02:25 +01:00
Max Bruckner
698dc528f4
parse_object: improve variable names + const correctness
2017-02-16 21:02:25 +01:00
Max Bruckner
3dc6339025
parse_array: improve variable names + const correctness
2017-02-16 20:08:59 +01:00
Max Bruckner
15592c50f6
parse_number: improve variable names + const correctness
2017-02-16 20:02:18 +01:00
Max Bruckner
efb5e1bc93
parse_string: Improve const correctnes of pointers
2017-02-16 20:00:12 +01:00
Max Bruckner
ace5047782
parse_string: reduce mental burden when reading the code
...
This restructures parse_string in a way, that you need to keep less
state in your head to understand the code.
This is achieved by:
* only changing the input pointer (current position) at a few places
(not all throughout)
* splitting out the UTF16 handling into a separate function
* renaming the variables so you know what they do without additional
context
2017-02-16 19:49:03 +01:00
Max Bruckner
03f23738bb
parse_object: simplify to one do-while loop
2017-02-16 19:49:02 +01:00
Max Bruckner
24dbf29360
parse_array: simplify to one do-while loop
2017-02-16 19:49:02 +01:00
Max Bruckner
b6974ecbc9
Makefile: Update compiler options
2017-02-16 12:52:00 +01:00
Max Bruckner
12b2daccf3
parse_{object,array}: set child only after parsing
...
This only attaches the parsed linked lists to the items passed to
parse_object and parse_array.
2017-02-16 01:03:43 +01:00
Max Bruckner
f8d0c47bdb
Remove unnecessary assignment and silence clang analyzer
2017-02-16 00:31:57 +01:00
Max Bruckner
9f6fa94c91
ensure: replace pow2gt with multiplication by two
...
This replaces the bit fiddling involved with calculating a new buffer
size by just multiplying the required length by two, paving the way to a
complete switch to size_t at a later point in time.
2017-02-16 00:23:38 +01:00
Max Bruckner
123bb1af7b
cJSON: prevent incompatible C and header versions
...
Introduces a preprocessor directive that aborts the compilation if the
version numbers in the header don't match with the numbers in the c
file.
2017-02-15 23:21:50 +01:00
Max Bruckner
cf862d0fed
implement AddItemToObject using AddItemToObjectCS
2017-02-15 21:46:24 +01:00
Max Bruckner
57d105d498
Merge pull request #108 from DaveGamble/cJSON_Invalid
...
Add new type cJSON_Invalid
2017-02-15 21:28:14 +01:00
Max Bruckner
5986edba1d
tests: Ensure that failed parsing returns invalid items
2017-02-15 21:25:52 +01:00
Max Bruckner
c6e1a281f9
tests: assertion macros
2017-02-15 21:25:52 +01:00
Max Bruckner
4f58695ed3
tests: extract common functionality to common.c
2017-02-15 21:25:51 +01:00
Max Bruckner
3facca4792
parse functions: Only set type after successful
...
This sets the type of an item only if parsing was successful.
This means that in case of failure, the item's type will remain to be
cJSON_Invalid.
2017-02-15 21:25:48 +01:00
Max Bruckner
cf48ea8175
New Type: cJSON_Invalid
...
This assigns the macro cJSON_Invalid to 0.
2017-02-15 21:19:38 +01:00
Max Bruckner
702fd95af3
fix #106 : potentially invalid free in cJSON_AddItemToObject
2017-02-15 20:45:23 +01:00
Max Bruckner
94117a5d23
Fix #105 , double free when parse_string fails
...
This fixes a double free that happens when calling cJSON_Delete on an
item that has been used by parse_string and it failed parsing the
string.
The double free happens, because parse_string frees an alias of
item->valuestring, but doesn't set item->valuestring to NULL.
2017-02-15 15:37:38 +01:00
Max Bruckner
c3bd4463be
cJSON_Utils: Guard use of %lu format string for size_t
2017-02-15 13:09:32 +01:00
Max Bruckner
9d7e8f1175
cJSON_Utils: Add casts to unsigned long, fix #103
...
Thanks @rrvirtual for the suggestion.
2017-02-09 15:09:06 +01:00
Max Bruckner
4047de4f6e
fix potential NULL dereferences found by coverity
2017-02-08 03:00:44 +01:00
Max Bruckner
49b9336558
Merge pull request #92 from DaveGamble/tests
...
Introduce the cunity testing framework
2017-02-07 21:50:07 +01:00
Max Bruckner
d04a2aeccf
README: Document additional CMake options
2017-02-07 21:44:37 +01:00
Max Bruckner
33e01ae087
Add support for Travis-CI
2017-02-07 21:35:38 +01:00
Max Bruckner
a09defec4c
CMake: Add ENABLE_SANITIZERS flag
...
Enabling this flag enables AddressSanitizer and
UndefinedBehaviorSanitizer
2017-02-07 21:35:21 +01:00
Max Bruckner
21c02cd3e5
CMake: Add Valgrind support
2017-02-07 21:35:21 +01:00
Max Bruckner
5a36b71a80
unity-tests: parse_value
2017-02-07 21:35:21 +01:00
Max Bruckner
9041570eba
unity-tests: parse_object
2017-02-07 21:35:21 +01:00
Max Bruckner
71b05fd4c2
unity-tests: parse_array
2017-02-07 21:35:21 +01:00
Max Bruckner
598b609c45
unity-tests: parse_string
2017-02-07 21:35:20 +01:00
Max Bruckner
b0e5209bde
unity-tests: test parse_hex4
2017-02-07 21:35:20 +01:00
Max Bruckner
7fd536d7e0
unity-tests: parse_number
2017-02-07 21:35:20 +01:00
Max Bruckner
be0951dfa4
Move parse tests from test.c -> parse_example.c
2017-02-07 21:35:20 +01:00
Max Bruckner
86be961bb5
test.c: remove file related code
2017-02-07 21:35:19 +01:00
Max Bruckner
bb60d6def5
cunity: parse_examples: test example files
...
Test parsing and printing example files
2017-02-07 21:35:19 +01:00
Max Bruckner
896e52255b
CMake: Build unity as library
2017-02-07 21:35:19 +01:00
Max Bruckner
12acc57967
unity: make it work with -Wconversion
2017-02-07 21:35:19 +01:00
Max Bruckner
6b9b57be22
Squashed 'tests/unity/' content from commit 1782bab
...
git-subtree-dir: tests/unity
git-subtree-split: 1782bab0bacd349a45bc215ff91f082912cd7a64
2017-02-07 21:30:57 +01:00
Max Bruckner
d19f3ae890
Merge commit '6b9b57be226a505a9c9cdd9ed029f22495ce04ec' as 'tests/unity'
2017-02-07 21:30:57 +01:00
Max Bruckner
e65ea3a45b
Merge pull request #101 from DaveGamble/simplify-correctness
...
Simplify some code and improve correctness
2017-02-07 21:29:11 +01:00
Max Bruckner
87f77274de
cJSON_SetNumberValue: Fix undefined double to int conversion
...
This might cause slight changes in behavior, but it shouldn't break
anything that is not already broken (for example the original macro
could either return a double, or an integer or whatever depending on if
object is NULL or not.)
2017-02-07 21:23:36 +01:00
Max Bruckner
dded751757
parse_string: remove useless first byte marks for utf8
2017-02-07 21:23:36 +01:00
Max Bruckner
d7b5545748
parse_hex4: deduplicate into a for loop
2017-02-07 21:23:36 +01:00
Max Bruckner
0747669972
parse_number: Switch to C library's strtod
...
Replaces the hand written floating point parser with the C library
implementation.
2017-02-07 21:23:36 +01:00
