Commit Graph

83 Commits

Author SHA1 Message Date
Krzysztof Gabis
473c7f3d8d Adds json_object_get_value_at function to access values in objects in O(1) time.
Also adds some missing null checking.
2016-04-23 11:59:34 +02:00
Krzysztof Gabis
77ef99571e Avoiding _CRT_SECURE_NO_WARNINGS redefinition. 2016-04-23 11:42:09 +02:00
Krzysztof Gabis
0c04a7e678 Removes unnecessary SKIP_WHITESPACES. 2016-04-16 12:35:44 +01:00
Krzysztof Gabis
f860d3dd1b Accepting json texts that are not objects or arrays.
According to RFC 7159 it's now valid to accept json texts that are not object or arrays.
Also reordered realloc opeartion in json_object_add to not be called if key already exists.
2016-04-16 12:30:46 +01:00
Krzysztof Gabis
19c1175064 Fixes a bug where fopen() error was being ignored. 2016-03-03 18:52:30 +00:00
Krzysztof Gabis
d7726760e0 Merge pull request #35 from vovanec/patch-1
Fixed error condition on malloc failure.
2016-02-08 20:50:21 +01:00
Volodymyr Kuznetsov
c27133715b Fixed error condition on malloc failure.
Fixed error condition on malloc failure, it looks like it should be temp_values, not temp_names.
2016-02-05 13:31:05 -08:00
Krzysztof Gabis
c9b920c4a3 Fixes a bug in json_array_remove and adds relevant tests (thanks to KB for finding this).
Also - it's 2016, time to update copyright notices, yay!
2016-01-13 20:47:47 +00:00
Krzysztof Gabis
8324ff92bf Escaping / to make json embeddable in xml\/html. 2015-11-08 16:34:34 +00:00
Krzysztof Gabis
849f00728b parson should compile with c++ compilers (again). 2015-10-05 08:37:25 +01:00
Krzysztof Gabis
86a5a20856 Adds comments regarding memory management. 2015-07-15 22:29:14 +01:00
Krzysztof Gabis
18761d99ff Checking if json_serialization_size failed. 2015-07-03 19:12:48 +01:00
Krzysztof Gabis
8eb5eab54d Checking if serialization_size is <0 before casting from int to size_t. 2015-07-01 19:24:16 +01:00
Krzysztof Gabis
f16e4292f3 Using same code for determining serialization buffer size and serialization. Updated license year. 2015-06-26 00:12:06 +02:00
Krzysztof Gabis
83a0a3e133 Changed "json_serialize_to_buffer_r" to return number of written characters. 2015-06-25 12:11:01 +02:00
Krzysztof Gabis
f4538fa53d Small change in test files. 2015-06-22 23:55:26 +02:00
Krzysztof Gabis
f4cfcd7699 Updates serialization example and readme.md 2015-06-22 19:30:06 +02:00
Krzysztof Gabis
6905548257 Pretty serialization + tests. 2015-06-22 16:53:19 +02:00
Krzysztof Gabis
1586461280 Adds function to change default allocator, fixes potential memory leak, refactoring. 2015-06-01 22:26:31 +01:00
Krzysztof Gabis
7fd8dc1c4c UTF8 validation in json_value_init_string (+ tests). 2015-05-03 12:55:48 +01:00
Krzysztof Gabis
7ead2102b8 Merge pull request #29 from i-rinat/fixups
Handle failures.
2015-04-29 21:49:51 +01:00
Rinat Ibragimov
9782447a74 free temporary JSON_Value's on failure 2015-04-29 22:44:17 +03:00
Rinat Ibragimov
717e551cb2 free memory after json_value_init_string_no_copy() failure 2015-04-29 21:46:18 +03:00
Rinat Ibragimov
33b77673cb check if ftell() returns -1 2015-04-29 21:27:41 +03:00
Krzysztof Gabis
2b4d17b337 Replaced strlen in process_string with pointer arithmetic. 2015-04-25 18:31:35 +01:00
Krzysztof Gabis
4a4cf7d795 Not parsing strings in json_value_init_string and *{set,dotset,replace,append}_string functions. 2015-04-06 10:12:04 +02:00
Krzysztof Gabis
0d5ac45286 Added additional null checks and tests. 2015-04-05 15:26:58 +02:00
Krzysztof Gabis
81c2fd0186 Merge pull request #23 from michaelsproul/no-exec-perms
Mark various files as not executable.
2015-03-01 09:36:38 +00:00
Michael Sproul
fcf0b810ba Marked various files as not executable.
Also updated the .gitignore file to ignore object code,
which is particularly useful when using this project as a
git submodule.
2015-02-28 20:33:17 -08:00
Krzysztof Gabis
1058e3b2c0 Fixed bug in example code. 2014-11-24 21:04:15 +01:00
Krzysztof Gabis
f57f2d94bb No longer escaping '/' when serializing. 2014-11-23 20:13:39 +01:00
Krzysztof Gabis
c88c775d23 Fixed floating point number comparison in tests (using fabs). 2014-11-23 12:39:47 +01:00
Krzysztof Gabis
69927e1612 Merge pull request #18 from gageas/master
Fix compile error on C++ compiler.
2014-11-12 13:40:06 +00:00
@gageas
775b2b21d0 Fix compile error on C++ compiler. (mismatch between char* and const char*) 2014-11-12 19:32:09 +09:00
Krzysztof Gabis
e4ac46318e Fixed memory leak in example. 2014-10-08 14:45:39 +02:00
Krzysztof Gabis
638190d6a0 Merged changes from parson-devel (serialization, copying, comparing, validation, creating values). 2014-10-07 21:11:29 +02:00
Krzysztof Gabis
55856a2eab Changes to readme. 2014-07-29 21:27:19 +02:00
Krzysztof Gabis
6e9e934b5a Bugfix in parsing escaped characters (+ additional tests to prevent this bug in future).
Thanks to Joseph Werle for bringing attention to it.
2014-06-10 20:59:35 +02:00
Krzysztof Gabis
c707051778 Added surrogate pairs support (JSON support is full now), removed PARSON_VERSION macro. 2014-04-10 17:00:40 +02:00
Krzysztof Gabis
19a0d79db4 Merge pull request #13 from indutny/fix/handling-files-with-whitespace
Skip whitespace at the start of string/file
2014-04-03 21:18:15 +02:00
Fedor Indutny
ce73431753 Skip whitespace at the start of string/file 2014-04-03 14:59:03 +04:00
Krzysztof Gabis
148e0ccbef Merge pull request #12 from stephenmathieson/fix/memory-leak
Fix memory leak
2013-12-06 12:32:21 -08:00
Stephen Mathieson
4413910346 Fix memory leak
If `fread` fails, `file_contents` is leaked.  I’m just freeing the memory allocated :)
2013-12-06 14:31:18 -05:00
Krzysztof Gabis
08a4396b32 Fixed warnings and error resulting in printing string without comments (old debug statement). 2013-11-30 20:35:55 +01:00
Krzysztof Gabis
d901014d55 New lines after flow control statements are now consistent. 2013-11-30 20:28:55 +01:00
Krzysztof Gabis
d5adf4e291 Added functions to parse file with comments and new tests.
json_parse_value_with_comments and json_parse_string_with_comments replace comments with whitespaces before parsing. Supported comments are: /* */ and //
2013-11-30 20:22:16 +01:00
Krzysztof Gabis
080325e566 Merge pull request #11 from stephenmathieson/add/package.json
Adds a package.json file.
2013-11-25 13:45:45 -08:00
Stephen Mathieson
18fe24a8c0 adding a package.json file 2013-11-24 23:14:48 -05:00
Krzysztof Gabis
a8c04faa39 Merge pull request #10 from spt5007/master
Check ferror if fread call fails in json_parse_file
2013-10-25 13:09:38 -07:00
Sean Turley
3585c6d030 Check ferror if fread call fails in json_parse_file 2013-10-25 15:18:35 -04:00