Commit Graph

779 Commits

Author SHA1 Message Date
56a32f9ecc Use error_position instead of error pointer internally 2017-04-08 17:56:27 +02:00
770e8263a5 tests for cJSON_ParseWithOpts 2017-04-08 17:56:27 +02:00
2683589d93 parser: Construct error pointer from buffer offset 2017-04-08 17:56:26 +02:00
c837177a56 utf16_literal_to_utf8: Support \u0000 2017-04-08 17:56:26 +02:00
80bc7652ae cJSON_ParseWithOptions: Remove end pointer 2017-04-08 17:56:26 +02:00
87a204ed0b parse_functions: Return booleans instead of pointers 2017-04-08 17:56:26 +02:00
c9739c59fd Replace strchr with switch case
This should improve performance and improve readability.
2017-04-08 17:56:25 +02:00
778a0c146f parse_string: Use parsebuffer 2017-04-08 17:56:25 +02:00
f69b109c9f parse_number: Use parse_buffer 2017-04-08 17:56:25 +02:00
fef1c45b92 parse_object: Use parse_buffer 2017-04-08 17:56:25 +02:00
033a542532 parse_array: Use parsebuffer 2017-04-08 17:56:25 +02:00
fd0320cf54 parse_value: Use parse_buffer 2017-04-08 17:56:24 +02:00
0f98214e71 parsebuffer: type and macros 2017-04-08 17:56:24 +02:00
06a2326e3b cJSON_ParseWithOpts: Use goto fail 2017-04-08 17:56:24 +02:00
11131b9ced cJSON_ParseWithOptions: Improve variable names and intent 2017-04-08 17:56:24 +02:00
99db5db9a4 Release version 1.4.6 v1.4.6 2017-04-08 17:54:55 +02:00
bb5ab5916f Merge pull request #147 from DaveGamble/copy-paste-msvc
Fix copy pasting with MSVC
2017-04-08 17:26:02 +02:00
411c50f671 Don't redefine CJSON_EXPORT_SYMBOLS 2017-04-08 16:39:35 +02:00
ec2db50b6f dllexport symbols by default and add CJSON_IMPORT_SYMBOLS
This should fix copy pasting of the C and header files with the MSVC
compiler.
2017-04-08 15:54:14 +02:00
74d0525201 Merge pull request #146 from DaveGamble/locale-independence
Locale independence
2017-04-08 14:46:22 +02:00
3efef58c32 README: Add setlocale to caveats 2017-04-08 03:50:22 +02:00
65541b900c Update space requirements of cJSON_PrintPreallocated 2017-04-08 03:42:44 +02:00
c08f7e1d29 print_number: Make locale independent
This first prints the number into a temporary buffer and then copies the
number to the output.

A positive side effect is that cJSON no longer reserves more space for
the number in the output than is necessary.
2017-04-08 03:38:49 +02:00
71b96afc27 print_number: Fix comment (missing word 'zeroes') 2017-04-08 02:46:24 +02:00
749fefc0c4 Make parse_number locale independent 2017-04-08 02:41:36 +02:00
50b3c30dfa README: Add Caveats section 2017-04-08 02:19:27 +02:00
c784f76c77 cJSON_strdup: Use sizeof("") instead of 1 2017-04-08 01:29:19 +02:00
84237ff48e Replace sizeof('\0') with sizeof("")
Because sizeof('\0') is actually sizeof(int) not sizeof(char).
2017-04-08 01:29:19 +02:00
ab8489a851 Readme: Fix #143 item->name --> item->string 2017-04-06 09:56:23 +02:00
795c3acabe cJSON_Utils: Fix potential null pointer dereference
Found by coverity
2017-04-05 17:36:25 +02:00
2683d4d987 ensure: Fix overflow detection 2017-04-05 16:35:55 +02:00
3c1bfe125c Clarify deprecation of valueint 2017-04-02 23:24:53 +02:00
5916f70640 cJSON.h: Deprecate valueint 2017-04-01 22:56:04 +02:00
29cfc7a767 README: Get rid of valueint and do necessary checks 2017-04-01 22:24:48 +02:00
b1e9a6c0da README: Add missing round brackets 2017-04-01 22:24:27 +02:00
3a20692c18 Release version 1.4.5 v1.4.5 2017-03-28 17:39:39 +02:00
2f65e80a34 Fix internal compiler error in GCC on x86 2017-03-28 17:32:20 +02:00
ef34500693 cJSON_SetNumberHelper: Fix valueint, closes #138
Thanks @mmkeeper
2017-03-28 17:29:52 +02:00
b0dfcde04c Release Version 1.4.4 v1.4.4 2017-03-23 22:13:25 +01:00
1934059554 ensure: Validate buffer offset 2017-03-23 22:01:38 +01:00
cc84a446be ensure: Fix potential off by one error. 2017-03-23 22:01:16 +01:00
e58f7ec027 ensure: Fix potential overflow of size_t
This could only happen if the maximum SIZE_T is not at least 2 times
bigger than INT_MAX. Not sure if this can happen on real systems, but
better be safe then sorry.
2017-03-23 20:26:29 +01:00
4bfb880093 cJSON.h: Note about buffer size for cJSON_PrintPreallocated 2017-03-22 16:39:10 +01:00
b7ce06224b Release version 1.4.3 v1.4.3 2017-03-19 11:05:33 +01:00
227d3398d6 Fix the pragmas for Wcast-qual with old gcc versions 2017-03-18 17:52:33 +01:00
466eb8e3f8 Fix wconversion with old gcc (e.g. 4.3) 2017-03-18 17:52:04 +01:00
4ec6e76ea2 tests: print_number: Fix build on 32bit ppc (and potentially others) 2017-03-18 13:25:18 +01:00
a1b37d0abe Release Version 1.4.2 v1.4.2 2017-03-16 01:28:23 +01:00
3d971db426 README: Mention supported cmake and make versions 2017-03-16 01:25:57 +01:00
30e1e7af7c CMake: Support cmake down to 2.8.5 2017-03-16 01:09:26 +01:00