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
100 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
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
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
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
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
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
Eric Haszlakiewicz 12916e229c Merge pull request #196 from rgerhards/improve-performance 
Performance improvements
 2015-09-28 22:25:29 -04: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 d4f8f92eb0 Squash deprecated function warning by replacing json_object_object_get calls with json_object_object_get_ex in test_cast. 2015-08-23 00:06:36 -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
Eric Haszlakiewicz 55530bfc0f Merge pull request #186 from Virtual-Instruments/master 
Syntax error
 2015-08-05 23:19:19 -04: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
Eric Haszlakiewicz cd8bd7f617 Tell the compiler we're intentionally ignoring the return value from __sync_val_compare_and_swap(). 2015-05-26 19:02:19 -07:00
Eric Haszlakiewicz cbedf2f7ca Merge pull request #149 from cicku/patch-2 
SONAME bump
 2015-05-09 21:35:22 -04:00
Eric Haszlakiewicz e4fce5d6ae Merge pull request #171 from Nzbuu/vs2010_build 
Update configuration for VS2010 and win64
 2015-05-08 21:31:37 -04:00
Eric Haszlakiewicz e1eb298de1 Merge pull request #182 from tpetazzoni/libm-fix 
Link against libm when needed
 2015-05-08 21:19:48 -04:00
Eric Haszlakiewicz 82a1316f76 Merge pull request #180 from yegorich/silent 
Enable silent build by default
 2015-05-08 21:19:05 -04:00
Eric Haszlakiewicz 68d856f618 Merge pull request #168 from bugness-chl/master 
Tightening the number parsing algorithm
 2015-03-03 22:41:31 -05:00
Eric Haszlakiewicz 7e3a6c6b9d Merge pull request #163 from sixlettervariables/fix-win32-build-problems 
Fix Win32 build problems
 2015-03-03 22:35:36 -05:00
Eric Haszlakiewicz da62fca305 Merge pull request #144 from mhei/master 
Introduce json_object_from_fd
 2015-03-03 22:12:49 -05: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
Eric Haszlakiewicz 6ec6fdaf8c Merge pull request #151 from mjchinn/json_type-comma 
Remove json_type enum trailing comma
 2014-09-13 22:18:14 -04:00
Eric Haszlakiewicz 2c722277ee Merge pull request #150 from ams-cs/master 
Fix build using MinGW.
 2014-09-13 22:17:57 -04:00
Eric Haszlakiewicz f88db708ac Merge pull request #141 from AlexandruCostache/master 
Removed duplicate check in random_seed test - bug #140
 2014-09-13 22:14:44 -04:00
Eric Haszlakiewicz d4e81f9ec8 Move the json_min() and json_max() macros to json_util.h and mark everything else in bits.h deprecated. 
Eliminate all uses of bits.h within the json-c code.
 2014-05-04 22:33:26 -04:00
Eric Haszlakiewicz 1da0599e0e Fix the definition of the error_description() macro in bits.h now that json_tokener_errors[] is not exported. 2014-05-03 22:26:26 -04: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 795e9151a1 Add an empty README file to placate autoconf. 2014-04-19 20:22:44 -04:00
Eric Haszlakiewicz 4569e3e430 Fix minor typo in README file. 2014-04-19 20:11:05 -04:00
Eric Haszlakiewicz 40aab4c502 Merge pull request #133 from haneefmubarak/patch-1 
Update and rename README to README.md
 2014-04-19 20:10:10 -04:00
Eric Haszlakiewicz 332a594fd4 Merge pull request #132 from pkoretic/master 
Remove unused variable 'size'
 2014-04-19 20:05:06 -04:00
Eric Haszlakiewicz fa54bd542e Update the release checklist to include calculating the tarball checksums and updating the wiki. 2014-04-11 20:07:49 -04:00
Eric Haszlakiewicz 515ba0dfb7 Bump versions up to 0.12.99 since a 0.12 release was just created. 2014-04-10 22:44:13 -04:00
Eric Haszlakiewicz f84d9c55db Update the ChangeLog with the changes for the 0.12 release. 
Bump the version in the release checklist.
 2014-04-10 21:07:20 -04:00
Eric Haszlakiewicz 784534a31f Eliminate the deprecated mc_abort() function and MC_ABORT macro. 2014-03-22 21:48:34 -04:00
Eric Haszlakiewicz f9136f6852 Make the json_tokener_errors array local. It has been deprecated for a while, and json_tokener_error_desc() should be used instead. 2014-03-22 21:41:24 -04:00
Eric Haszlakiewicz 936d036ea3 Simplify the tests Makefile to avoid repeating the name of each test. 2014-03-22 21:40:37 -04:00
Eric Haszlakiewicz e2bbb5664c Rename the "test_case" test to "test_charcase" to make it slightly less confusing. 2014-03-22 21:15:41 -04:00
Eric Haszlakiewicz 9f26d96f09 Fix warnings from autoconf about "...no AC_LANG_SOURCE call detected..." by adding that call within the AC_LINK_IFELSE call. 2014-03-22 19:15:01 -04:00
Eric Haszlakiewicz 05da316b9c Issue #103: allow Infinity and -Infinity to be parsed. 2014-03-22 17:28:40 -04:00
Eric Haszlakiewicz 217bc29352 Merge pull request #123 from fingon/use-NAN-if-available 
nan function requires -lm on some platforms - use of NAN is better, if available
 2014-03-22 13:39:36 -04:00
Eric Haszlakiewicz 0eedf3802f Issue#102 - add support for parsing "NaN". 2014-03-09 16:41:33 -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
Eric Haszlakiewicz db117ca02b Merge pull request #121 from TazeTSchnitzel/LowercaseLiterals 
Missing lowercase literals test
 2014-02-12 13:37:17 -05:00
Eric Haszlakiewicz 4c086dfff7 Merge commit '89535bb' 2014-02-11 23:57:24 -05:00
Eric Haszlakiewicz 020fa65724 Merge pull request #112 from TazeTSchnitzel/LowercaseLiterals 
Only allow lowercase literals in STRICT mode
 2014-02-11 23:21:50 -05:00
Eric Haszlakiewicz 56df93d128 Fix Issue #111: Fix off-by-one error when range checking the input to json_tokener_error_desc(). 2014-02-11 23:16:53 -05:00
Eric Haszlakiewicz ceeaf42bc8 Merge pull request #109 from kdopen/use_strtod 
Avoid potential overflow in json_object_get_double
 2014-02-11 23:13:19 -05:00
Eric Haszlakiewicz b821f0e10f Merge branch 'ebassi-master' 2014-02-11 23:06:19 -05:00
Eric Haszlakiewicz c8e0497d47 Merge branch 'master' of https://github.com/ebassi/json-c into ebassi-master 
Conflicts:
	Makefile.am
 2014-02-11 23:05:54 -05:00
Eric Haszlakiewicz 295bea21d0 Ignore and cleanup a few more files that automake creates. 2014-02-11 23:03:46 -05:00
Eric Haszlakiewicz a2c078fc6e Issue#105: Rename configure.in to configure.ac 2014-02-11 22:55:52 -05:00
Eric Haszlakiewicz c8ee919642 Remove the old libjson.so name compatibility support. The library is only created as libjson-c.so now and headers are only installed into the ${prefix}/json-c directory. 2014-02-11 22:49:59 -05: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 b83e0f1182 Ignore the test-driver script that is now created, and the script for the test_locale test. 2013-09-08 17:30:54 -05:00
Eric Haszlakiewicz 60e4990d1d The updated test driver creates .log and .trs files; ignore them. 2013-09-08 17:23:24 -05:00
Eric Haszlakiewicz 8d18815f8a strndup is gone, remove it from the README file. 2013-09-08 17:21:52 -05:00
Eric Haszlakiewicz b939bd3768 Merge pull request #97 from pascal-bach/master 
Add const qualifiers to json_object_to_file and json_object_to_file_ext
 2013-09-08 13:36:40 -07: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
Eric Haszlakiewicz a030120c55 Merge pull request #95 from rouault/extern_json_object_set_serializer 
Add extern to json_object_set_serializer so that it gets exported (Windows fix)
 2013-09-08 13:33:22 -07:00
Eric Haszlakiewicz 02aa6f01f4 Merge pull request #94 from remicollet/issue-strict2 
more strictness
 2013-09-08 13:29:05 -07:00
Eric Haszlakiewicz 8356ecc16b Merge pull request #93 from tmielika/master 
fixing problem that isinf(-Inf) can be 1 or -1
 2013-09-08 13:26:56 -07:00
Eric Haszlakiewicz bd42b8310d Merge pull request #104 from rouault/fix_json_tokener_error_desc_out_of_bounds_read 
Fix potential out-of-bounds read in json_tokener_error_desc
 2013-09-08 13:20:08 -07:00
Eric Haszlakiewicz b3bce4d594 Eliminate use of MC_ABORT in json-c code, and mark MC_ABORT/mc_abort deprecated. 
Also adjust an error message in json_util to make it unique.  Fixes #87.
 2013-06-29 15:31:18 -05:00
Eric Haszlakiewicz be002fbb96 Issue#84: explicitly remove old headers and include/json directory so creating the compat symlink can work. 2013-06-29 15:21:04 -05:00
Eric Haszlakiewicz c62965660b Fix the _MSC_VER check so it compiles on non-windows compilers. Issue#91 2013-06-23 19:12:14 -05:00
Eric Haszlakiewicz 5e8df40523 Mention that libtoolize is needed if you're not using a release tarball. 2013-06-23 18:55:02 -05:00
Eric Haszlakiewicz d032aad1f4 Minor spell check. 2013-06-19 09:14:19 -05:00
Eric Haszlakiewicz 8b1bdbb94d Merge pull request #90 from remicollet/issue-strict 
in strick mode, number must not start with 0
 2013-06-19 07:13:21 -07:00
Eric Haszlakiewicz 98a62a7652 Merge pull request #89 from ayanes/master 
Support NaN and Infinity
 2013-06-18 21:18:27 -07:00