Commit Graph

363 Commits

Author SHA1 Message Date
ecd5678527 Change all internal sizes to size_t 2017-02-03 18:36:12 +01:00
28b9ba4334 Change all internal strings to unsigned char* 2017-02-03 15:59:00 +01:00
b182ced1d6 Compiler flag -Wswitch-default + add defaults 2017-02-03 12:21:36 +01:00
fe18403935 Compiler flag -Wundef + fix incorrect macro 2017-02-03 12:14:50 +01:00
981f59b163 Release Version 1.2.1 v1.2.1 2017-01-30 19:36:36 +01:00
e4eadb9a81 Merge pull request #97 from DaveGamble/fix96-null-pointer-dereference
Fix potential null pointer dereference in cJSON_Utils
Fixes #96
2017-01-30 19:34:33 +01:00
ff0681e4fd Utils: PatchDetach: Check for invalid patch string 2017-01-30 19:30:16 +01:00
a2309a509d Utils: InplaceDecodePointerString: Check for NULL 2017-01-30 19:29:52 +01:00
c49ffbfba8 cJSON_Version: returns a version string
This is useful to programmatically find out the version of cJSON that
has been used (useful in case of scripting language bindings for
example).
2017-01-12 20:37:29 +01:00
e7533aa6f0 Put version information in the header
This is important so that it is always known which version of the
library is used, especially if the C and Header files have just been
copy pasted to another code base.
2017-01-12 20:35:13 +01:00
de8eaaba89 Release version 1.2.0 v1.2.0 2017-01-09 12:25:31 +01:00
b2da44d6cb Merge pull request #90 from DaveGamble/cJSON_Raw
Add support for raw JSON
2017-01-09 12:22:00 +01:00
f6998a6a34 Contributors: Add Jiri Zouhar 2017-01-09 12:02:21 +01:00
e3e0b5150b cJSON_CreateRaw: Format fixes 2017-01-05 21:33:52 +01:00
1df987a170 cJSON_strdup: Check for NULL string 2017-01-05 21:31:17 +01:00
ddadb44a67 cJSON_Raw: Additional checks in print_value 2017-01-05 21:30:37 +01:00
9ef44fc0b6 Remove C++ comment in header 2017-01-05 21:12:10 +01:00
8c58e62597 Merge remote-tracking branch 'loigu/master' into cJSON_Raw 2017-01-05 21:07:08 +01:00
8893e39712 gitignore: ignore *.orig 2017-01-04 20:40:34 +01:00
3d6ae11340 Make cJSON C++ compatible 2016-12-28 12:33:20 +01:00
a1f2600883 Contributors: Add Romain Porte 2016-12-28 12:29:03 +01:00
fcc85bdfbc Gitignore: Add Makefile output 2016-12-28 12:23:56 +01:00
7d08a3518a Merge pull request #88 from MicroJoe/fix-readme-tests
Fix bad CMake argument in README
2016-12-28 12:20:37 +01:00
cc486a0354 Fix bad CMake argument in README 2016-12-27 11:32:41 +01:00
fcc89c4bb2 Move increment out of loop condition fixes #85 2016-12-15 11:12:42 +01:00
a0431e226f Merge pull request #83 from gatzka/feature/cast_qual_v3
Introduce compiler check if const is casted away.
2016-12-08 21:59:32 +07:00
89edfb6741 Warn if cast removes a type qualifier like const. 2016-12-08 13:21:30 +01:00
e69db83de5 Temporarily disable warning when const is cast away.
There was a long running discussion here
https://github.com/DaveGamble/cJSON/pull/80 how to provide const
correctness for users of cJSON.

To avoid breaking changes for users of cJSON v1 it was decided to
disable this warning.

pragma was tested with gcc 5.4.0/6.2.1 and clang 3.8/3.9.
2016-12-08 13:21:18 +01:00
5310da351d contributors: Add Alper Akcan v1.1.0 2016-12-06 09:01:12 +07:00
68196f5b14 Release version 1.1.0 2016-12-06 08:56:23 +07:00
d992cd46e6 test: Handle cJSON_PrintPreallocated return values correctly 2016-12-06 08:47:44 +07:00
84b48121bb header: explain PrintPreallocated return value 2016-12-06 08:46:48 +07:00
f10e2f884a test: exit on malloc failure 2016-12-06 08:41:51 +07:00
eeb6d237b6 Merge pull request #81 from alperakcan/master
fix memory leak in cJSON_Duplicate
2016-12-06 08:36:47 +07:00
5b4420298f fix memory leak in cJSON_Duplicate 2016-12-05 14:23:04 +03:00
e1eb06fae0 cJSON.h warn about write access to constants (#80)
Add a comment that warns about potential write access to constant memory
locations after using cJSON_AddItemToObjectCS.
2016-11-30 22:14:16 +07:00
6aefa45056 Merge pull request #79 from gatzka/fix/test
Make print_preallocated static.
2016-11-29 08:19:33 +07:00
345d57e9e5 Make print_preallocated static.
Otherwise compilation failes due to missing prototypes.
2016-11-28 20:21:38 +01:00
3da18a2df9 contributors: Add Kyle Chisholm 2016-11-29 00:01:21 +07:00
bf17703012 Merge branch 'print_preallocated' 2016-11-28 23:08:25 +07:00
6622c54f18 Handle out of memory when printing string 2016-11-28 23:06:38 +07:00
8df4cd46eb more concise return 2016-11-28 22:59:55 +07:00
3917fb5255 use print_preallocated function to test printout of JSON 2016-11-28 22:59:55 +07:00
99896d879c function to print and compare to preallocated buffer 2016-11-28 22:59:55 +07:00
4d1dcaa160 check print_value return 2016-11-28 22:59:54 +07:00
de93d76d0b changed to cJSON_PrintPreallocated, added flag in printbuffer 2016-11-28 22:59:53 +07:00
602c241a0b fixed "make test" on Mac (clang) 2016-11-28 22:53:36 +07:00
23dafa4739 added Print function call for pre-allocated buffer 2016-11-28 22:53:33 +07:00
59cf4112d2 Merge pull request #78 from gatzka/feature/gcc_check_strict_overflow_v2
gcc check strict overflow v2
2016-11-28 22:29:03 +07:00
5cfda2292f Warn if compiler optimizes based on asumption signed overflow does not occur.
This switch is only active when making a release build.
2016-11-28 09:12:17 +01:00