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
579 Commits 16 Branches 12 Tags
7b7a76e161a2b727e68ce26c32c2fb3467682840
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Haszlakiewicz 7b7a76e161 Fix bad usage of strncat introduces in 1a94c70. Pointed out by @rouault in PR #331. 2017-07-09 15:04:18 -07:00
Eric Haszlakiewicz 55ecae3e58 Eliminate static qualifiers on a couple local variables that were causing thread safety issues. Suggested by @rouault in PR #331. 2017-07-09 14:56:18 -07:00
Eric Haszlakiewicz 5a99e527ff Reformat json_object_double_to_json_string_format() to have consistent spacing. 2017-07-08 20:33:28 -07:00
Eric Haszlakiewicz 5e33dabda1 Issue #308: improve the build instructions in README.md to include the exact commands to run for installing prerequisites, as mentioned earlier on Issue #308. 2017-07-08 19:35:06 -07:00
Eric Haszlakiewicz fd9b3b2260 Issue #332: fix a long-standing bug in array_list_put_idx() where it would attempt to free previously free'd entries due to not checking the current array length. 
Add a test that triggers the problem to ensure it stays fixed.
 2017-07-08 19:04:35 -07:00
Eric Haszlakiewicz 7fd74fc7a3 Merge pull request #312 from Tailmon/master 
Fix CMake Build process improved for MinGW and MSYS2
 2017-07-08 21:25:48 -04:00
Eric Haszlakiewicz 4deed587e7 Merge pull request #319 from Dashlane/visual-studio-build 
Windows: Fix dynamic library build with Visual Studio
 2017-07-08 21:24:55 -04:00
Eric Haszlakiewicz a3f97eeeeb Merge pull request #329 from commodo/rename-static-lib 
build,cmake: build,cmake: rename libjson-c-static.a to libjson-c.a
 2017-07-08 15:44:27 -04:00
Eric Haszlakiewicz db3115cee9 Merge pull request #330 from commodo/symlink_some_tests 
tests: symlink basic tests to a single file that has the common code
 2017-07-08 15:43:45 -04:00
Eric Haszlakiewicz cc201fdcaa Merge pull request #333 from besser82/bugfix/obsolete_macros_autotools 
Replace obsolete AM_PROG_LIBTOOL
 2017-07-08 15:17:17 -04:00
Eric Haszlakiewicz a36396992d Merge pull request #321 from commodo/fix-cmake-vasprintf 
build,cmake: fix vasprintf implicit definition and generate both static & shared libs
 2017-06-19 00:34:44 -04:00
Eric Haszlakiewicz e8e574fbe4 Issue #161: add a json_object_to_fd() function. 2017-06-18 18:44:45 +00:00
Eric Haszlakiewicz 23e064ad29 Fix test_double_serializer expected output. 2017-06-18 18:34:41 +00:00
Eric Haszlakiewicz 1a94c70336 Add a json_c_set_serialization_double_format() function to set the *library-wide* format for how doubles are written to a serialized JSON output. 2017-06-18 18:12:07 +00:00
Eric Haszlakiewicz 8581806558 Make _set_last_err() non-static so it can be used outside of json_util.c 2017-06-18 18:11:17 +00:00
Eric Haszlakiewicz e76ea37772 Merge pull request #325 from rouault/fix_stack_overflow_in_json_object_double_to_json_string_format 
Fix stack buffer overflow in json_object_double_to_json_string_format()
 2017-05-21 21:35:16 -04:00
Eric Haszlakiewicz 6bd86d1044 Merge pull request #311 from jj1118/master 
Fix error C3688 when compiling on Visual Studio 2015
 2017-03-26 03:52:57 +00:00
Eric Haszlakiewicz 4e673656a1 Merge pull request #310 from marxin/fix-gcc7-warnings 
Add FALLTHRU comment to handle GCC7 warnings.
 2017-03-22 23:37:14 -04:00
Eric Haszlakiewicz 82f5a4ab29 Merge pull request #305 from alexanderst/master 
Fix compilation without C-99 option
 2017-03-03 23:12:56 -05:00
Eric Haszlakiewicz 8c86207258 Add a few more cases to test_parse to provide some examples of how parsing works; should help address the questions raised in Issue #302. 2017-02-26 16:22:45 +00:00
Eric Haszlakiewicz d74b7eb144 Merge pull request #303 from yogo1212/tokener_h 
fix doc in tokener header file
 2017-02-24 22:34:36 -05:00
Eric Haszlakiewicz 3948fcad2d Issue #300: Cast size_t values to int instead of unsigned long long to work around broken behavior of MinGW. 2017-02-05 17:00:35 +00:00
Eric Haszlakiewicz bad6c9a427 Issue #300: Some platforms, such as MinGW, don't have ETXTBSY and ENOTBLK, so skip those there. 2017-02-05 04:44:30 +00:00
Eric Haszlakiewicz 9a64fd7d55 Issue #300: Use %p instead of %lx in test_util_file since some platforms' pointers are larger than "unsigned long". 
Also, there's no need to worry about output consistency here, since it'll be
 different anyway due to different pointer values.
 2017-02-05 04:38:53 +00:00
Eric Haszlakiewicz 91977159ee Add cast to int in calls to isdigit() since some platforms complain about char being used as an array index. 2017-02-05 04:34:05 +00:00
Eric Haszlakiewicz 3fab117e4e Merge pull request #299 from qlyoung/perf-improvements 
Improve json_object -> string performance
 2017-02-04 11:13:14 -05:00
Eric Haszlakiewicz 75825a9f01 Use strdup instead of strndup in test1.c, there's no need for the latter because json_object_to_json_string_length() will always return a properly sized string. 2017-02-03 17:10:27 +00:00
Eric Haszlakiewicz 8157784483 Issue #295: also check if size_t is the size of long long, to help support 64-bit Windows platforms. 2017-01-07 22:55:31 -05:00
Eric Haszlakiewicz 177c401e02 Ignore tests/test_float 2016-12-18 14:35:06 -05:00
Eric Haszlakiewicz 0a010a59eb Change a memcpy that should be a memmove within json_pointer_get, and fix memory leaks in of one the json_pointer tests. 2016-12-18 14:33:41 -05:00
Eric Haszlakiewicz 779b77a164 Note some minimum versions needed for autoconf, etc... 2016-12-12 23:01:20 -05:00
Eric Haszlakiewicz a443b9f7e7 Issue#292: bump the required version of configure listed in configure.ac so a more useful error message is generated, rather than failing later because the extra macros from ./autoconf-archive/m4/ didn't get loaded. 2016-12-11 19:18:33 -08:00
Eric Haszlakiewicz 1e4824a841 Merge pull request #289 from jgerhards/i-278 
bugfix: floating point representaion without fractional part
 2016-12-04 20:52:33 -05:00
Eric Haszlakiewicz d050f1e622 Merge pull request #287 from commodo/json_pointer_va_args 
json_pointer: extend setter & getter with printf() style arguments
 2016-11-24 15:03:50 -05:00
Eric Haszlakiewicz 8e12f4a21c Merge pull request #285 from ebassi/revert-strdup-compat 
Revert "compat/strdup.h: move common compat check for strdup() to own…
 2016-11-09 09:56:58 -05:00
Eric Haszlakiewicz e8ce1db471 Merge pull request #283 from commodo/json_pointer 
json_pointer: add first revision based on RFC 6901
 2016-11-04 11:48:30 -04:00
Eric Haszlakiewicz d4899bd4d5 Handle NULL objects in json_object_get_userdata() by returning NULL, but abort in json_object_set_userdata() since we can't actually do anything with the userdata. 2016-10-29 15:42:36 -04:00
Eric Haszlakiewicz f8132f932d Issue #280: add a few assert() calls to ensure objects are of the appropriate type. 2016-10-29 15:31:31 -04:00
Eric Haszlakiewicz 33339ae595 Use json_visit() to clear the serializer data set when parsing so the output from test_parse reflects the actual values parsed. 2016-10-29 15:13:16 -04:00
Eric Haszlakiewicz ecdc14f535 Add a json_c_visit() function to provide a way to iterate over a tree of json-c objects. 2016-10-29 15:01:20 -04:00
Eric Haszlakiewicz 7e12b9f47c Fix broken key-order test in test_compare. 2016-10-10 00:13:39 -04:00
Eric Haszlakiewicz 80150a18d3 Merge pull request #272 from sgerbino/master 
Allows for compilation with CMake on macOS
 2016-10-08 13:13:33 -04:00
Eric Haszlakiewicz 818156f6f7 Merge pull request #277 from ALLTERCO/json_object_set_xxx 
Json object set xxx
 2016-10-08 12:08:53 -04:00
Eric Haszlakiewicz 36a28fcb0c Issue #275: fix out of bounds read when handling unicode surrogate pairs. 2016-10-05 23:15:51 -04:00
Eric Haszlakiewicz 5fd99e62ed Merge pull request #273 from konoal/master 
fixed wrong object name in json_object_all_values_equal
 2016-09-28 08:08:01 -04:00
Eric Haszlakiewicz 5653bc61a4 Merge pull request #274 from pepevel/master 
Support for 64 bit pointers on Windows
 2016-09-28 08:05:50 -04:00
Eric Haszlakiewicz 9f9c3326fe Merge pull request #267 from sixlettervariables/patch-1 
Removes me as Win32 maintainer, because I'm not.
 2016-09-12 18:19:26 -04:00
Eric Haszlakiewicz ea1499a372 Issue #263: add const so the prototype for json_object_object_add_ex() matches the definition. 2016-08-24 23:41:22 -04:00
Eric Haszlakiewicz 0fcf1d1ae7 Fix memory leak and inconsistent output (due to varying fd numbers) in test_util_file. 2016-08-20 23:06:22 -04:00
Eric Haszlakiewicz 5fccfed4f4 Issue #260: add a check to prevent trivial loops in the object tree, even though it is up to the callers to avoid doing so in more complex cases. 2016-08-20 22:42:59 -04:00
Eric Haszlakiewicz c4d060bf80 json_object_object_add_ex() should have shared code with json_object_object_add(), and been changed to return int at the same time the latter was. Do that now. 
Also correct a couple of calls to _to_json_string to check the return value.
 2016-08-20 22:42:59 -04:00
Eric Haszlakiewicz e40505e489 Merge branch 'RyDroid-tests' 2016-08-13 09:17:25 -04:00
Eric Haszlakiewicz 61cd433131 Merge branch 'tests' of https://github.com/RyDroid/json-c into RyDroid-tests 
Conflicts:
	tests/test_util_file.c
 2016-08-13 09:17:01 -04:00
Eric Haszlakiewicz e076ae756d Merge pull request #251 from RyDroid/editorconfig 
Adding a file for EditorConfig
 2016-08-13 08:31:57 -04:00
Eric Haszlakiewicz 4d62de3898 Revert bogus change to json_object_get() made in f40b08d8 that caused it to always return NULL. (Issue #259) 
Also undo NULL check in json_tokener_set_flags(): it's not at all valid toi
 try to set flags on a NULL pointer, and doing so should not be silently
 ignored.
 2016-08-11 17:05:41 -04:00
Eric Haszlakiewicz 0ad87649d4 Merge pull request #255 from RyDroid/minor-c2 
Minor changes in C source code
 2016-08-10 15:06:30 -04:00
Eric Haszlakiewicz 9f9a9ac426 Merge pull request #252 from RyDroid/minor-no-c 
Very minor changes not related to C source code
 2016-08-09 07:39:27 -04:00
Eric Haszlakiewicz 71d0615e98 Merge branch 'jobol-issue-165' 2016-08-09 07:38:18 -04:00
Eric Haszlakiewicz f3db59d990 Merge branch 'issue-165' of https://github.com/jobol/json-c into jobol-issue-165 
Conflicts:
	tests/test_util_file.c
 2016-08-09 07:36:54 -04:00
Eric Haszlakiewicz bc3e691a1e Merge pull request #253 from RyDroid/cppcheck-travis 
Adding a test with cppcheck for Travis CI
 2016-08-08 22:57:56 -04:00
Eric Haszlakiewicz 51b011ce24 Merge pull request #249 from RyDroid/readme 
Improving README
 2016-08-08 22:53:33 -04:00
Eric Haszlakiewicz d758f4a8a7 Add a brief style guide. Address Issue #257. 2016-08-08 22:50:23 -04:00
Eric Haszlakiewicz 33ae9f5d44 Merge pull request #250 from RyDroid/gitignore 
Improving .gitignore
 2016-08-08 18:42:01 +00:00
Eric Haszlakiewicz 9688f343a5 Issue #246: Include xlocale.h too, to get locale_t defined, since not all OSes include that in locale.h 2016-08-02 22:25:05 -04:00
Eric Haszlakiewicz fa76e4a8c9 Issue #195: Actually call uselocale() in the new locale handling code in json_tokener. 
Also, be sure the right locale_t is freed if we fail on the second uselocale.
Finally, fix test_locale so it *doesn't* use json_object_to_json_string as
 that will simple re-emit the original parsed string values.
 2016-07-31 14:43:14 -04:00
Eric Haszlakiewicz 4091b9c87e Issue #195: use uselocale() instead of setlocale() in json_tokener to behave better in threaded environments. 2016-07-30 21:34:58 -04:00
Eric Haszlakiewicz 7d637362b7 Linux's %p format doesn't return "0x0" for NULL pointers, so switch to using %lx for consistency. 2016-07-30 15:09:51 -04:00
Eric Haszlakiewicz deb9fa482d Issue #240: add arbitrary use of val's in foreach loops to squash warnings about unused variables. 2016-07-30 18:27:53 +00:00
Eric Haszlakiewicz b366750e11 Merge pull request #239 from ploxiln/printbuf_empty 
initialize null terminator of new printbuf
 2016-07-16 13:49:08 -04:00
Eric Haszlakiewicz 2b255d0ebf Fix absolute paths in test_util_file that vary depending on where it is run. 2016-06-27 04:30:10 +00:00
Eric Haszlakiewicz b1d65b62db Issue #113: Add more files to EXTRA_DIST and a dist-hook to get distcheck to at least not fail. 2016-06-27 04:30:04 +00:00
Eric Haszlakiewicz 1071385896 Issue #113: add "new" files to appropriate variables in Makefile, and note the need to run "make distcheck" as part of the release process. 
Fix issues with the test script so it works under distcheck too.
 2016-06-27 04:15:30 +00:00
Eric Haszlakiewicz 29005ef7b1 Merge pull request #238 from nagamalli9999/master 
linkhash.c: optimised the table_free path
 2016-06-26 23:09:42 -04:00
Eric Haszlakiewicz 29ef73f21d Issue #189: Eliminate use of MC_ERROR from json_util.c, and add a json_util_get_last_err() function to retrieve the error for those callers that care about it. 
Add tests and descriptions for the functions in json_util.c
 2016-06-26 02:20:33 +00:00
Eric Haszlakiewicz 595891729e Issue #236: Add -Wcast-qual and fix casts to retain constness. 
To better distinguish between entry->k and entry->v being const within linkhash, but non-const outside, add lh_entry_v() and lh_entry_k() accessors.
Make lh_entry->k const.
 2016-06-11 18:19:39 +00:00
Eric Haszlakiewicz f285c0a2e5 Issue #175: disable the fast-and-loose code in hashlittle() when running with AddressSanitizer. 2016-06-08 03:24:59 +00:00
Eric Haszlakiewicz ae66b24369 Mention that we're aiming to follow RFC 7159 now. 
Cause README.md to show up in Doxygen output as the main page.
 2016-06-08 02:37:15 +00:00
Eric Haszlakiewicz 40de3c67cd Merge pull request #232 from NeoRaider/size_t2 
tests/tests1: fix printf format for size_t arguments
 2016-06-07 16:47:40 -04:00
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