mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-20 21:49:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
398 Commits 14 Branches 11 Tags
537f8bcbdbdc10ffa7673199a0be82ca4eb56ec8
Commit Graph

54 Commits

Author SHA1 Message Date
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
Eric Haszlakiewicz
12916e229c Merge pull request #196 from rgerhards/improve-performance 
Performance improvements
 2015-09-28 22:25:29 -04: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
Eric Haszlakiewicz
1757a31750 Fix doc for json_object_new_boolean() to indicate the correct value for TRUE (1). 2015-08-23 00:08:14 -04:00
Eric Haszlakiewicz
93b1fe63e5 Add back in the __attribute__((__unused__)) that was lost in the previous commit. 
It's needed to squash a "variable 'val' set but not used" warning.
 2015-08-23 00:00:12 -04:00
Eric Haszlakiewicz
a8bbefbbb4 Merge pull request #183 from cryogen/master 
Apply compile warning fix to master branch
 2015-08-22 15:24:26 -04: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
Stuart Walsh
75d7409c4e Fix uninitialised variable compile warning, and also fix unused-when-used warning 2015-05-10 09:21:28 +01:00
Eric Haszlakiewicz
484ca368f0 Slight style tweaks to the bsearch changest. 2015-03-04 03:10:10 +00:00
Eric Haszlakiewicz
a500c1f0b5 Merge pull request #155 from LeSpocky/bsearch 
add bsearch for arrays
 2015-03-03 22:00:08 -05:00
Eric Haszlakiewicz
9db3099572 Merge pull request #156 from jubalh/master 
Remove trailing whitespaces
 2015-03-03 21:37:02 -05:00
Eric Haszlakiewicz
ec4879ac5b Merge pull request #153 from LeSpocky/doc 
improve doc for json_object_to_json_string()
 2014-09-13 22:18:51 -04:00
Michael Vetter
fcf5ad1bd6 Remove trailing whitespace 2014-08-26 14:48:59 +02: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
Alexander Dahl
37f5d8696d improve doc for json_object_to_json_string() 2014-08-18 10:28:38 +02:00
Michael J. Chinn
048dcf288a Remove json_type enum trailing comma 2014-08-10 00:46:25 -04:00
Michael Clark
64e36901a0 Patch to address the following issues: 
* CVE-2013-6371: hash collision denial of service
* CVE-2013-6370: buffer overflow if size_t is larger than int
 2014-04-09 13:48:21 +08: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
Even Rouault
6c4bb3840c Add extern to json_object_set_serializer so that it gets exported (Windows fix) 2013-08-11 01:18:17 +02:00
Greg Hazel
88bf1c9960 one definition of json_object_object_foreach only works on c99 and later 2013-03-19 16:26:12 -07:00
Eric Haszlakiewicz
5b36a432c8 Merge branch 'remicollet-issue-float' 
Conflicts:
	json_util.c
 2013-02-26 21:09:10 -06:00
Eric Haszlakiewicz
9b64c05ff9 Mark the "val" variable in json_object_object_foreach as unused so the compiler doesn't complain. Fix warnings in the testReplaceExisting test. 2013-02-21 12:32:29 -06:00
Eric Haszlakiewicz
92d289f5d3 Add a comment briefly describing json_object_object_length() 2013-02-09 16:18:05 -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
Alexander Klauer
beb12d49e1 Make macro json_object_object_foreach multiple-use safe 2012-12-19 10:31:39 +01:00
Remi Collet
32d149c8f6 probably worth an option for this 2012-12-13 11:46:04 +01:00
Eric Haszlakiewicz
f6b27cbb6c Make it safe to delete keys while iterating with the json_object_object_foreach macro. 2012-10-20 20:26:37 -05:00
Eric Haszlakiewicz
5abc0ea444 Reformat the json_object_object_foreach macro so it is readable, and document what is allowed to be done with the object while iterating. 2012-10-20 20:10:15 -05:00
Eric Haszlakiewicz
5f4739e2eb Change json_object_put to return 1 if the object passed was actually freed. (or 0 if only the reference count was decremented) 2012-10-18 17:10:09 -05:00
Eric Haszlakiewicz
38f421a2e7 Add a json_set_serializer() function to allow the string output of a json_object to be customized. 2012-09-02 15:21:56 -05:00
Eric Haszlakiewicz
3fcffe1bb0 Add a json_object_to_json_string_ext() function to allow the formatting of output to be selected. 
There are now three options: JSON_C_TO_STRING_SPACED, JSON_C_TO_STRING_PLAIN and JSON_C_TO_STRING_PRETTY.
This also add a json_object_to_file_ext() that takes the same flags.
Existing output of json_object_to_json_string() is unchanged, and uses JSON_C_TO_STRING_SPACED.
Thanks fo Grant Edwards for the initial patches.
 2012-04-28 13:26:09 -05:00
Keith Derrick
6917586acf Add NULL-safe get object method 
New json_object_object_get_ex() method protects itself against null pointers
and invalid objects being passed in.
 2012-04-12 11:50:08 -07:00
Keith Derrick
ca519fb817 Added explanatory notes to documentation. 2012-04-05 19:54:12 -07:00
Eric Haszlakiewicz
6ff0817bac Mention json_type_to_name() in the docs for json_object_get_type(). 2012-03-31 22:47:47 -05:00
Eric Haszlakiewicz
aef439a175 Adjust json_object_is_type and json_object_get_type so they return json_type_null for NULL objects. 2012-03-31 13:47:28 -05:00
Keith Derrick
37e7467476 Rename boolean type to json_bool 
In building large systems, there are often clashes over the
preferred base type to use for bool/boolean. At least one
experience has been with a 3rd party proprietary library which
can not be changed. In that case, boolean was a synonym for
unsigned char and used widely in packed structures.
 2012-03-26 14:29:31 -07:00
Eric Haszlakiewicz
b21b137805 Include json_inttypes.h in json_object.h since we use types like int32_t in the API and some systems need that header to compile. 
As part of this create a public json_config.h with a custom define to
decide whether to include inttypes.h to avoid conflicting with other
projects config.h header.
 2012-02-15 20:47:11 -06:00
Frederik Deweerdt
c43871c866 Add new json_object_array_sort function 
- uses libc's qsort to sort the arraylist
 - add test in test1.c
 2011-10-07 21:07:18 +02:00
Jehiah Czebotar
43d2f417c7 move definition of json_object_iter to public header to enable external use of json_object_object_foreachC 
Patch from Rick Moran <https://github.com/DrHayt>


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@74 327403b1-1117-474d-bef2-5cb71233fd97
 2011-05-25 04:49:20 +00:00
Eric Haszlakiewicz
886c4fbebf Add a json_type_to_name() function which returns a string that describes the type. Useful for logging. 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@67 327403b1-1117-474d-bef2-5cb71233fd97
 2011-05-03 20:40:49 +00:00
Jehiah Czebotar
ac601b5b5f update json_object_new_string_len, json_escape_str (internal). Writer handles \x00 correctly 
Added parse_null test. This does not change anything with how the parser handles \u0000 or null characters

This commit is addapted from one by Adomas Paltanavičius <adomas@leanholding.com>



git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@63 327403b1-1117-474d-bef2-5cb71233fd97
 2011-01-14 17:23:06 +00:00
ehaszla
252669cee6 Simplify things by storing integer values only as int64_t's internally, and 
omit the range check during parsing since we already have the checks when
 accessing the value. There is no longer a json_type_int64, only json_type_int.
Fix some problems with parsing 0 and -0 values, and add a couple of tests.
Fix some minor compile issues on HPUX environments.


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@60 327403b1-1117-474d-bef2-5cb71233fd97
 2010-12-07 18:15:35 +00:00
Michael Clark
c4dceae1c5 * Add int64 support. Two new functions json_object_net_int64 and 
json_object_get_int64. Binary compatibility preserved.
    Eric Haszlakiewicz, EHASZLA at transunion com
    Rui Miguel Silva Seabra, rms at 1407 dot org



git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@56 327403b1-1117-474d-bef2-5cb71233fd97
 2010-10-06 16:39:20 +00:00
Michael Clark
aaec1ef3c5 * Don't use this as a variable, so we can compile with a C++ compiler 
* Add casts from void* to type of assignment when using malloc 
  * Add #ifdef __cplusplus guards to all of the headers
  * Add typedefs for json_object, json_tokener, array_list, printbuf, lh_table
    Michael Clark, <michael@metaparadigm.com>


git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@33 327403b1-1117-474d-bef2-5cb71233fd97
 2009-02-25 02:31:32 +00:00
Michael Clark
e6548a3dc2 fix typo in json_object.h 
git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@28 327403b1-1117-474d-bef2-5cb71233fd97
 2009-01-10 13:58:06 +00:00
Michael Clark
68cafad078 Add const correctness to public interfaces 
Gerard Krol, g dot c dot krol at student dot tudelft dot nl

Update version number to 0.9



git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@27 327403b1-1117-474d-bef2-5cb71233fd97
 2009-01-06 22:56:57 +00:00
Michael Clark
14862b1ef3 Patch allows for json-c compile with -Werror and not fail due to 
-Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
Geoffrey Young, geoff at modperlcookbook dot org



git-svn-id: http://svn.metaparadigm.com/svn/json-c/trunk@20 327403b1-1117-474d-bef2-5cb71233fd97
 2007-12-07 02:50:42 +00:00