mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-09-07 16:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
435 Commits 16 Branches 12 Tags
a42caac8055d14c1b4e7022df170a849a7fd79b3
Commit Graph
435 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Haszlakiewicz a42caac805 Copy over note about the 0.12.1 release to the master branch. 2016-06-07 04:13:15 +00:00
Eric Haszlakiewicz 0539191d18 Check the __GCC_HAVE_SYNC_COMPARE_AND_SWAP_{2,4,8} defines to decide whether to use __sync_val_compare_and_swap(), as described at https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html 
Also, fix the types of the variables when building on Windows.
Also, should address issue #214.
 2016-06-07 03:26:46 +00:00
Eric Haszlakiewicz 1eb5a700f9 Merge pull request #230 from ebassi/master 
Use stdint.h to check for size_t size
 2016-06-06 22:59:38 -04:00
Eric Haszlakiewicz e61eb409fd Merge pull request #233 from NeoRaider/size_t3 
Include stddef.h in json_object.h
 2016-06-06 22:55:44 -04:00
Eric Haszlakiewicz ce7ad480f4 Merge pull request #234 from NeoRaider/userdata 
Add public API to use userdata independently of custom serializer
 2016-06-06 22:54:40 -04:00
Michael Clark 0e1a057449 Remove reference to svn.metaparadigm.com 
svn.metaparadigm.com no longer exists so it is not possible to use source from there.
 2016-06-07 08:11:16 +12:00
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
Matthias Schiffer 22fdcfc71a Include stddef.h in json_object.h 
It is needed for size_t.
 2016-05-29 05:19:50 +02:00
Emmanuele Bassi 28c1ca1240 Use stdint.h to check for size_t size 
If we use json_inttypes.h we are going to fail when builddir != srcdir,
and since JSON_C_HAVE_INTTYPES_H is defined after the configure script
has run, including json_inttypes.h would be the equivalent on including
stdint.h anyway.

This fixes the build of json-c in the GNOME Continuous builder.
 2016-05-23 10:20:48 +01:00
Eric Haszlakiewicz 7ae5c3f7a6 Issue #142: un-deprecate json_object_object_get(), but note why you might want to use json_object_object_get_ex() instead. 2016-05-23 03:02:34 +00:00
Eric Haszlakiewicz 5e4e5f7d9d Issue #205: use _strdup instead of strdup on Windows. 2016-05-23 02:37:09 +00:00
Eric Haszlakiewicz f4ca1325ae Merge branch 'doctaweeks-fixes-for-upstream' 2016-05-23 02:12:51 +00: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
Eric Haszlakiewicz b2c5969aff Merge pull request #193 from jplitza/master 
Make serialization format of doubles configurable
 2016-05-18 16:10:27 -04: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
Jan-Philipp Litza 2200ffa8b0 Fix code in docs for json_object_new_double_s() 2016-05-06 16:12:19 +02:00
Eric Haszlakiewicz 3345b25962 Add tests for the json_object_array_del_idx() function. 2016-04-30 19:09:45 +00:00
Eric Haszlakiewicz 9edf2418e0 Merge branch 'Protovision-master' 2016-04-30 18:53:16 +00: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 e3fb74942a Merge pull request #216 from Jehan/master 
configure: check realloc with AC_CHECK_FUNCS() to fix cross-compilation.
 2016-04-30 14:45:16 -04:00
Eric Haszlakiewicz c6a97eb9ce Merge pull request #218 from sevan/patch-1 
Use a macro to indicate C99 to the compiler
 2016-04-30 14:44:29 -04: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
Eric Haszlakiewicz afa9f824e7 Merge pull request #222 from chenha0/master 
Fix issue #221: JSON_C_TO_STRING_NOSLASHESCAPE works incorrectly
 2016-04-30 14:40:30 -04:00
Eric Haszlakiewicz 02a2151b2b Merge pull request #223 from minaguib/master 
Clarify json_object_get_string documentation of NULL handling & return
 2016-04-30 14:36:02 -04:00
Mina Naguib 138c2a6b97 Clarify json_object_get_string documentation of NULL handling & returning 2016-02-07 20:55:25 -05: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 dec5fcd50b Add some basic tests for verifying json_object_equal behavior 
Do some basic checks on ints, doubles, strings, arrays and "complex" objects.
 2016-01-13 15:56:39 +01: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
Sevan Janiyan 7150b7f28d Use a macro to indicate C99 to the compiler 
The [AC_PROG_CC_C99 macro](https://www.gnu.org/software/autoconf/manual/autoconf-2.64/html_node/C-Compiler.html) sets the complier to the C99 standard if the compiler does not default to such behaviour (albeit gnu99). This is better than specifically hardcoding flags
 2016-01-05 11:43:17 +00:00
Jehan 79c99aeb2b configure: check realloc with AC_CHECK_FUNCS() to fix cross-compilation. 
AC_FUNC_REALLOC is messed up when cross-compiling, ending up in failed
build with "undefined reference to `rpl_realloc'" error.
AC_CHECK_FUNCS will work both with native and cross builds.
 2016-01-01 18:46:02 +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 882b7d95cc Issue #137: remove config.h.in from change control. 2015-12-08 21:20:42 -06:00
Eric Haszlakiewicz 980cdd61be Merge commit '2be921d88376e78f84d79aafa6db2714da804e59' 2015-12-08 20:51:06 -06:00
Eric Haszlakiewicz 65be8275da Merge pull request #209 from rgerhards/fix-regression 
fix regression from 2d549662be
 2015-11-29 21:24:50 -05: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 5a6a378725 Merge pull request #198 from unmole/master 
Fix possible memory leak and remove superfluous NULL checks before free()
 2015-11-28 13:58:07 -05:00
Daniel M. Weeks 92e9a5032b Use size_t for json object array ops 2015-11-24 14:00:32 -05:00
Daniel M. Weeks 45c56b80c4 Use size_t for array list length and size 2015-11-24 14:00:31 -05:00
Rainer Gerhards 36610fb697 fix regression from 2d549662be 
That commit introduced read-only keys, but when the hash table
was resized, that attribute was not preserved. This resulted in
an invalid free at time of table destruction.
 2015-11-19 11:05:15 +01:00
Eric Haszlakiewicz c97bbd3797 Merge pull request #199 from Nzbuu/fix_vs_build 
Fix build in Visual Studio
 2015-11-14 23:31:15 -05:00
Eric Haszlakiewicz b82a51a5cd Merge pull request #200 from Nzbuu/ci_build 
Add build scripts for CI platforms
 2015-11-14 23:30:38 -05:00
James Myatt 239c146a4b Appveyor: Visual Studio v140 no longer fails 2015-11-05 13:50:30 +00:00
James Myatt fd43c2b99a Appveyor: Create artefact with library and include files only 2015-11-05 13:45:01 +00:00
Eric Haszlakiewicz 80c1f69b9e Use AX_APPEND_COMPILE_FLAGS() to check the various compile flags, such as -Wall, to ensure the compile supports. 2015-10-23 02:16:40 +00:00
Eric Haszlakiewicz 10d50aadf2 Remove the AC_FUNC_MALLOC check, since we don't depend on the malloc(0) behavior it checks for, and we don't provide a rpl_malloc() implementation anyway. 2015-10-22 02:57:13 +00:00
James Myatt 82030cd0af Travis: add osx and clang builds 2015-10-09 23:58:02 +01:00