mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-21 14:09:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
431 Commits 14 Branches 11 Tags
e61eb409fd404cb5e6683dd9be77f49bd9cef5c4
Commit Graph

86 Commits

Author SHA1 Message Date
Matthias Schiffer
f87e378d48 Add public API to get and set userdata 
Also, json_object_set_serializer is changed to respect the userdata
and user_delete parameters when to_string_func is NULL.
 2016-05-29 11:24:55 +02:00
Matthias Schiffer
c2b004ba0e Make default double serializer ignore userdata again 
The user might want to use the userdata for something different, so the
serializer should ignore it by default.

Explicitly setting the serializer to json_object_double_to_json_string will
still make it interpret the userdata as a format string.
 2016-05-29 11:24:55 +02:00
Eric Haszlakiewicz
996be85843 Fix a few places that needed adjustment for the size_t changes, including updating the range checks to use a calculated SIZE_T_MAX. 2016-05-23 02:10:58 +00:00
Eric Haszlakiewicz
9a2915ce66 Merge branch 'fixes-for-upstream' of https://github.com/doctaweeks/json-c into doctaweeks-fixes-for-upstream 2016-05-23 02:08:28 +00:00
Jan-Philipp Litza
21dc5dc92b Export json_object_double_to_json_string() and use custom format string 2016-05-06 16:12:44 +02:00
Eric Haszlakiewicz
1fb87cd196 Merge branch 'master' of https://github.com/Protovision/json-c into Protovision-master 2016-04-30 18:52:47 +00:00
Eric Haszlakiewicz
82bdbdba24 Merge pull request #219 from rouault/low_heap_robustness_fixes 
Fix various potential null ptr deref and int32 overflows
 2016-04-30 14:44:05 -04:00
Eric Haszlakiewicz
4e0c8b55fb Merge pull request #220 from hschaa/master 
Add utility function for comparing json_objects
 2016-04-30 14:42:16 -04:00
chenha0
dffdee966f Fix issue #221: JSON_C_TO_STRING_NOSLASHESCAPE works incorrectly 
Tests added.
 2016-01-21 20:12:48 +08:00
Helmut Schaa
00e475c434 Add utility function for comparing json_objects 2016-01-13 15:56:38 +01:00
Even Rouault
77a4276a8c Fix various potential null ptr deref and int32 overflows 
This fix errors that can happen when ingesting very large JSON files
when hitting the maximum heap size of the process.
 2016-01-11 12:15:54 +01:00
Eric Haszlakiewicz
537f8bcbdb Add const qualifiers to several functions that don't modify the json_object. 2015-12-26 21:42:18 +00:00
Eric Haszlakiewicz
980cdd61be Merge commit '2be921d88376e78f84d79aafa6db2714da804e59' 2015-12-08 20:51:06 -06:00
Eric Haszlakiewicz
316da85818 Fix issue #201: add a JSON_C_TO_STRING_NOSLASHESCAPE flag to turn off escaping of forward slashes. 2015-11-28 20:00:30 -06:00
Daniel M. Weeks
92e9a5032b Use size_t for json object array ops 2015-11-24 14:00:32 -05:00
James Myatt
3f012eb0f8 Fix build in Visual Studio 2015-10-09 23:24:55 +01:00
Eric Haszlakiewicz
12916e229c Merge pull request #196 from rgerhards/improve-performance 
Performance improvements
 2015-09-28 22:25:29 -04:00
Rainer Gerhards
c4f8cc34df more efficient handling for smalls strings inside json_object 
smalls strings inside json_objects had a high overhead because dynamic
memory allocation was needed for each of them. This also meant that the
pointer needed to be updated. This is now changed so that small strings
can directly be stored inside the json_object. Note that on the regular
64 bit machines a pointer takes 8 bytes. So even without increasing
memory, we could store string up to 7 bytes directly inside the object.
The max size is configurable. I have selected up to 31 bytes (which
means a buffer of 32 including the NUL byte). This brings a 24-bytes
memory overhead, but I consider that still useful because the memory
allocator usually also has quite some overhead (16 bytes) for
dyn alloced memory blocks. In any case, the max buffer size can be
tweaked via #define.
 2015-09-23 15:56:48 +02:00
Rainer Gerhards
1ae4b50bde remove unneeded data items from hashtable code 
These items were used for statistics tracking, but no code at all
exists to consume them. By removing them we save

a) space
   because they counters required space, and did so in each and every
   json object

b) performance
   because calloc() needs to write less data and the counters are
   no longer maintained; cache performance can be better, load
   on OS main memory is lighter

We could conditionally enable/disable these counters, but I have not
done this they were really nowhere used and it looked more like a
left-over from the import of hashtable code.
 2015-09-23 12:40:57 +02:00
Rainer Gerhards
2d549662be add json_object_object_add_ex() API 
This provides more control over some detail aspects, many
of which are performance related.
 2015-09-23 09:43:00 +02:00
Rainer Gerhards
d8e44dc685 reduce duplicate hash computation in json_object_object_add() 
This can be a very considerable performance saver.
 2015-09-22 19:07:30 +02:00
Eric Haszlakiewicz
b594c34f57 Merge pull request #174 from haata/master 
Adding JSON_C_TO_STRING_PRETTY_TAB flag
 2015-05-31 12:10:13 -07:00
Jacob Alexander
92d4cf15f0 Adding JSON_C_TO_STRING_PRETTY_TAB flag 
- Tabs are easier to read for tired eyes and editor adjustable
 2015-05-27 17:37:39 -07:00
Mark Swoope
cdca9d3c8e Added array_list_del_idx and json_object_array_del_idx 2015-04-02 14:05:27 -07:00
James Myatt
18b3c49296 Use more appropriate casts 2015-03-04 10:45:37 +00:00
Eric Haszlakiewicz
484ca368f0 Slight style tweaks to the bsearch changest. 2015-03-04 03:10:10 +00:00
Alexander Dahl
2f5789bdef add bsearch for arrays 
Arrays can already be sorted with json_object_array_sort() which uses
qsort() of the standard C library. This adds a counterpart using the
bsearch() from C.
 2014-08-21 15:42:50 +02:00
Eric Haszlakiewicz
2149a04ca8 Check for failures when allocating memory; return NULL and set errno=ENOMEM in a few of those cases. 
Thanks to Susant Sahani for pointing out some of these.
 2014-04-19 20:33:05 -04:00
Eric Haszlakiewicz
92a7740e90 Reformat some code in json_object.c 2014-04-19 20:23:54 -04:00
Eric Haszlakiewicz
e6f1322b5e Issue#114: check for the presence of isnan and isinf, and provide compat macros on MSCV where _isnan and _finite exist instead. 2014-03-02 12:16:37 -05:00
Keith Derrick
c51b88d69a Avoid potential overflow in json_object_get_double 
sscanf is always a potential problem when converting numeric
values as it does not correctly handle over- and underflow
(or at least gives no indication that it has done so).

This change converts json_object_get_double() to use strtod()
according to CERT guidelines.
 2013-10-01 10:17:00 -07:00
Eric Haszlakiewicz
06450206c4 Issue #59: change the floating point output format to %.17g so values with more than 6 digits show up in the output. 2013-09-11 21:09:43 -05:00
Eric Haszlakiewicz
a23caf677c Use sizeof instead of hard coded values when calling snprintf. 2013-09-11 20:28:56 -05:00
Eric Haszlakiewicz
51993c28c2 Added a json_object_new_double_s() convenience function to allow an exact string representation of a double to be specified when creating the object and use it in json_tokener_parse_ex() so a re-serialized object more exactly matches the input. 
Add json_object_free_userdata() and json_object_userdata_to_json_string() too.
 2013-09-11 20:27:39 -05:00
Eric Haszlakiewicz
ef43fe3571 Merge pull request #96 from rouault/remove_strdnup 
Remove redefinition of strndup() which is no longer used in the codebase
 2013-09-08 13:35:28 -07:00
Even Rouault
1a957c2edc Remove redefinition of strndup() which is no longer used in the codebase 2013-08-12 20:49:19 +02:00
Taneli Mielikainen
c5523a17e8 fixing problem that isinf(-Inf) can be 1 or -1 2013-08-04 00:21:58 +03:00
Eric Haszlakiewicz
98a62a7652 Merge pull request #89 from ayanes/master 
Support NaN and Infinity
 2013-06-18 21:18:27 -07:00
Adrian Yanes
d086e2018c Fixes for Infinity and NaN 
Although JSON RFC does not support NaN or Infinity
as numeric values ECMA 262 section 9.8.1 defines
how to handle these cases as strings
 2013-06-12 19:48:00 -07:00
Anatol Belski
ed819fb926 snprintf definition is needed here, too 2013-06-04 20:18:05 +02:00
Eric Haszlakiewicz
5b36a432c8 Merge branch 'remicollet-issue-float' 
Conflicts:
	json_util.c
 2013-02-26 21:09:10 -06:00
Greg Hazel
cca74c6de6 add json_object_object_length 2013-01-11 01:36:55 -08:00
Alexander Klauer
2be921d883 Fixed json_object_object_add(). 
* Return value of json_object_object_add() changed from void to int.
  Return value now indicates success or failure.

* Check whether allocations are successful.

* Do not exit program from within the library.
 2013-01-08 14:24:21 +01:00
Abioy
7eaa849e9a escape '\f' in json_escape_str 
'\f' is a llegal char and should be escape in printbuf
 2012-12-24 22:22:05 +08:00
Remi Collet
32d149c8f6 probably worth an option for this 2012-12-13 11:46:04 +01:00
Remi Collet
8c847968c7 Save space, drop unuseful trailing zeroes 2012-12-13 11:22:31 +01:00
Remi Collet
4014fe86d9 Simple fix to double encode 2012-12-13 11:16:03 +01:00
Eric Haszlakiewicz
4e4af93d66 Fix issue #53 - ensure explicit length string are still NUL terminated, and fix json_tokener_parse() to work properly with embedded unicode \u0000 values in strings. 
Adjust test_null to check for this case.
See also http://bugs.debian.org/687269
 2012-12-09 16:32:11 -06:00
Eric Haszlakiewicz
e36e562872 Reformat json_object_object_get() and json_object_object_get_ex(). 2012-10-18 17:16:36 -05:00
Eric Haszlakiewicz
5450bed051 Fix json_object_object_get() so it returns NULL if the incoming json_object is NULL. 2012-10-18 17:14:41 -05:00