Commit Graph

201 Commits

Author SHA1 Message Date
282006d918 reformatting: update 2016-10-02 19:01:26 +07:00
7f9a2691bf reformatting: ensure 2016-10-02 19:01:26 +07:00
b53ce73709 reformatting: printbuffer 2016-10-02 19:01:26 +07:00
d5bd497636 reformatting: pow2gt 2016-10-02 19:01:26 +07:00
88cbe57ba4 reformatting: parse_number 2016-10-02 19:01:25 +07:00
46cfa68a2b reformatting: cJSON_Delete 2016-10-02 19:01:25 +07:00
55488f66f6 reformatting: cJSON_New_Item 2016-10-02 19:01:25 +07:00
8db7e6d320 reformatting: cJSON_InitHooks 2016-10-02 19:01:25 +07:00
18081c03c4 reformatting: cJSON_strdup 2016-10-02 19:01:24 +07:00
542ed727d7 reformatting: cJSON_strcasecmp 2016-10-02 19:01:24 +07:00
c42b774f9f reformatting: cJSON_GetErrorPtr 2016-10-02 19:01:24 +07:00
94df772485 fix buffer overflow (#30) 2016-10-02 18:56:53 +07:00
3a7bd6924a Utility function to generate the patch between two objects. 2016-05-29 18:16:19 +01:00
e79fa9472b cJSONUtils_MergePatch with tests from the RFC. 2016-05-29 17:39:54 +01:00
2fe50bd557 get rid of isnormal test!! 2016-05-29 16:19:14 +01:00
4488c2b5ad Merge pull request #4 from irwand/fix_division_by_zero_test
Fix compiler div-by-0 error when it encountered 1.0/0.0
2016-05-29 16:09:06 +01:00
87f55416c1 we can safely remove this, since the initial d==0 case catches this. 2016-05-29 16:01:06 +01:00
c15e09d2a6 and again. 2016-05-29 15:42:34 +01:00
12d7ccf63b fix typo. 2016-05-29 15:40:47 +01:00
224c2a8485 Fix compiler error when it encountered 1.0/0.0. It does not want to deal
with division by 0.
Tricked the compiler to use volatile local variable zero instead, so it
does not know for sure whether or not it's going to be zero.
2016-04-22 14:27:20 -05:00
e6b352d126 tidy up some code that was added a while back. 2016-03-20 00:24:41 +00:00
b4151361de Allow for global/local error pointers. If you supply a return_parse_end
to cJSON_ParseWithOpts, then that will store the error pointer (if
parsing fails).
2016-03-19 18:41:44 +00:00
c6d868cf06 add this to .gitignore 2016-03-19 18:26:57 +00:00
fe967cd1ff extra checking for memory allocation failure. 2016-03-19 18:14:19 +00:00
ee579ecbd6 Integrate patch for handling broken unicode surrogate pairs, with
thanks to kolman and Irwan Djajadi on SourceForge.
2016-03-19 18:14:06 +00:00
a6a75645e4 Merge pull request #26 from nagamalli9999/master
Using values in powers of two for cJSON_* constants
2016-03-06 20:10:15 +00:00
dbf16a0eb8 Merge pull request #31 from ChristianSch/master
fixed segmentation fault for non-json input / provided test case
2016-03-06 20:09:02 +00:00
52d7d14f6c fixed segfault when the lib tries to parse HTML with embedded CSS; provided test case 2016-03-06 16:43:53 +01:00
e70366a65a Merge pull request #29 from schmidtw/master
Publish the libraries and headers to the right directories during 'make install'.
2016-02-16 17:33:32 +00:00
a5c60cd223 Improve the locations so the destination is correct as well as the include path. 2016-02-15 06:36:21 -08:00
2cac21e156 Add install targets. 2016-02-15 06:21:48 -08:00
53b7e74c9c Merge pull request #27 from nagamalli9999/makefile-uninstall
Added uninstall rule to Makefile
2016-02-11 13:09:29 -05:00
5daac864a3 Added uninstall rule to Makefile 2016-02-11 18:26:54 +05:30
8d94ecec75 Merge branch 'master' of https://github.com/nagamalli9999/cJSON 2016-02-10 10:01:03 +05:30
ce546b54d8 Changed the #define values of cJSON* data types
We can use bitops to check if the parsed JSON is of a particular types
using OR
2016-02-10 09:58:13 +05:30
51371c899e Changed the #define values of cJSON* data types
We can use bitops to check if the parsed JSON is of a particular types
using OR
2016-02-09 22:52:10 +05:30
e95313adad Merge pull request #24 from FSMaxB/fix_code_order
Fix printing of empty string pointers
2015-10-25 23:48:38 -04:00
8222e9b8c4 Fix printing of empty string pointers
Once the check if str is NULL is reached, str has already been
derereferenced in the for loop, so in the case that the if clause would
be entered, the program has already crashed due to a null pointer
dereference.

By checking the content of str before dereferencing, the code in the if
clause is actually useful.

for (ptr=str;*ptr;ptr++) flag|=((*ptr>0 && *ptr<32)||(*ptr=='\"')||(*ptr=='\\'))?1:0;

...

if (!str)
...
2015-10-26 03:08:47 +01:00
d4906be4f0 Merge pull request #23 from FSMaxB/format_fix
Fix format problem with empty objects
2015-10-25 22:02:33 -04:00
9cc37a2844 Fix format problem with empty objects
When printing empty objects, the closing curly brace was missing one
indentation level.

Example from the output of test_utils:

BEFORE FIX:
{
	"foo":	"bar",
	"child":	{
		"grandchild":	{
	}
	}
}

AFTER FIX:
{
	"foo":	"bar",
	"child":	{
		"grandchild":	{
		}
	}
}
2015-10-26 02:43:44 +01:00
361b9a58cb Merge pull request #19 from FSMaxB/fix_boolean
fix boolean expression
2015-10-18 17:03:47 -04:00
99c46e7661 Merge pull request #20 from FSMaxB/fix_memory_leaks
fix memory leaks
2015-10-18 17:03:25 -04:00
c7241f5314 Merge pull request #22 from FSMaxB/unreachable_line
Remove line that will never be executed
2015-10-18 17:03:03 -04:00
7c25dc9135 Remove line that will never be executed 2015-10-16 15:01:24 +02:00
58bc383b28 fix memory leaks 2015-10-14 11:02:56 +02:00
ec71726ef8 fix boolean expression
This expression was always false.
2015-10-13 20:33:37 +02:00
1a20eb8494 Fixed linux compile to support fpclassify (issue #18) 2015-10-05 13:46:14 -04:00
8865d869db cJSON_HasObjectItem didn’t compile 2015-10-01 12:03:27 -04:00
322e440e78 Merge pull request #16 from npi3pak/patch-1
README.md: fixed formatting
2015-10-01 11:38:53 -04:00
11fb0d0215 Merge pull request #15 from dieyushi/master
add new macro for iterating over an array
2015-10-01 11:38:33 -04:00