]>
granicus.if.org Git - json-c/log
Eric Haszlakiewicz [Sun, 21 Aug 2016 02:41:49 +0000 (22:41 -0400)]
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.
Eric Haszlakiewicz [Sun, 21 Aug 2016 02:35:29 +0000 (22:35 -0400)]
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.
Eric Haszlakiewicz [Sat, 13 Aug 2016 13:17:25 +0000 (09:17 -0400)]
Merge branch 'RyDroid-tests'
Eric Haszlakiewicz [Sat, 13 Aug 2016 13:17:01 +0000 (09:17 -0400)]
Merge branch 'tests' of https://github.com/RyDroid/json-c into RyDroid-tests
Conflicts:
tests/test_util_file.c
Eric Haszlakiewicz [Sat, 13 Aug 2016 12:31:57 +0000 (08:31 -0400)]
Merge pull request #251 from RyDroid/editorconfig
Adding a file for EditorConfig
Nicola Spanti (RyDroid) [Mon, 8 Aug 2016 13:11:19 +0000 (15:11 +0200)]
Very minor changes to some tests
Nicola Spanti (RyDroid) [Sun, 7 Aug 2016 16:20:59 +0000 (18:20 +0200)]
Adding a file for EditorConfig
Eric Haszlakiewicz [Thu, 11 Aug 2016 21:03:16 +0000 (17:03 -0400)]
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.
Eric Haszlakiewicz [Wed, 10 Aug 2016 19:06:30 +0000 (15:06 -0400)]
Merge pull request #255 from RyDroid/minor-c2
Minor changes in C source code
Eric Haszlakiewicz [Tue, 9 Aug 2016 11:39:27 +0000 (07:39 -0400)]
Merge pull request #252 from RyDroid/minor-no-c
Very minor changes not related to C source code
Eric Haszlakiewicz [Tue, 9 Aug 2016 11:38:18 +0000 (07:38 -0400)]
Merge branch 'jobol-issue-165'
Eric Haszlakiewicz [Tue, 9 Aug 2016 11:36:54 +0000 (07:36 -0400)]
Merge branch 'issue-165' of https://github.com/jobol/json-c into jobol-issue-165
Conflicts:
tests/test_util_file.c
Eric Haszlakiewicz [Tue, 9 Aug 2016 02:57:56 +0000 (22:57 -0400)]
Merge pull request #253 from RyDroid/cppcheck-travis
Adding a test with cppcheck for Travis CI
Eric Haszlakiewicz [Tue, 9 Aug 2016 02:53:33 +0000 (22:53 -0400)]
Merge pull request #249 from RyDroid/readme
Improving README
Eric Haszlakiewicz [Tue, 9 Aug 2016 02:50:23 +0000 (22:50 -0400)]
Add a brief style guide. Address Issue #257.
Eric Haszlakiewicz [Mon, 8 Aug 2016 18:42:01 +0000 (18:42 +0000)]
Merge pull request #250 from RyDroid/gitignore
Improving .gitignore
Nicola Spanti (RyDroid) [Sun, 7 Aug 2016 16:24:53 +0000 (18:24 +0200)]
Improving .gitignore
Nicola Spanti (RyDroid) [Sun, 7 Aug 2016 16:29:11 +0000 (18:29 +0200)]
Improving README
Nicola Spanti (RyDroid) [Mon, 8 Aug 2016 13:23:27 +0000 (15:23 +0200)]
Adding a test with cppcheck for Travis CI
Nicola Spanti (RyDroid) [Mon, 8 Aug 2016 13:20:41 +0000 (15:20 +0200)]
Minor changes in C source code
Nicola Spanti (RyDroid) [Mon, 8 Aug 2016 13:12:44 +0000 (15:12 +0200)]
Very minor changes not related to C source code
Eric Haszlakiewicz [Wed, 3 Aug 2016 02:25:05 +0000 (22:25 -0400)]
Issue #246: Include xlocale.h too, to get locale_t defined, since not all OSes include that in locale.h
José Bollo [Mon, 1 Aug 2016 13:04:54 +0000 (15:04 +0200)]
test: add test of 'json_object_to_json_string_length'
The test is implied in test1.
The idea is to check that the returned lengths and strings
are identical to what is expected to return the already
tested function 'json_object_to_json_string_ext'.
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Eric Haszlakiewicz [Sun, 31 Jul 2016 18:39:56 +0000 (14:39 -0400)]
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.
Eric Haszlakiewicz [Sun, 31 Jul 2016 01:34:58 +0000 (21:34 -0400)]
Issue #195: use uselocale() instead of setlocale() in json_tokener to behave better in threaded environments.
Eric Haszlakiewicz [Sat, 30 Jul 2016 19:09:51 +0000 (15:09 -0400)]
Linux's %p format doesn't return "0x0" for NULL pointers, so switch to using %lx for consistency.
Eric Haszlakiewicz [Sat, 30 Jul 2016 18:27:53 +0000 (18:27 +0000)]
Issue #240: add arbitrary use of val's in foreach loops to squash warnings about unused variables.
jobol [Tue, 26 Jul 2016 17:22:25 +0000 (19:22 +0200)]
Add method 'json_object_to_json_string_length'
This new method allows to also
get the length of the generated string.
Fix #165
Change-Id: Iea91404027f143ca3d29a4c58d7c07ae53556110
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
José Bollo [Wed, 27 Jul 2016 12:42:25 +0000 (14:42 +0200)]
Fix a compiling error
The function fstat isn't declared without this include
on debian strect/sid and Fedora-23
Change-Id: I660a32ff173dcba04674aed51ed855b4fa55ac67
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Eric Haszlakiewicz [Sat, 16 Jul 2016 17:49:08 +0000 (13:49 -0400)]
Merge pull request #239 from ploxiln/printbuf_empty
initialize null terminator of new printbuf
Pierce Lopez [Sat, 16 Jul 2016 04:30:31 +0000 (00:30 -0400)]
initialize null terminator of new printbuf
It's possible (e.g. by using json_object_from_file() on an empty file)
to get json-c to try to use a printbuf that has never had anything
written to it. Before this change, it could access a string that
should be length zero, but was never initialized, and could
theoretically have an unexpected string.
Eric Haszlakiewicz [Mon, 27 Jun 2016 04:29:07 +0000 (04:29 +0000)]
Fix absolute paths in test_util_file that vary depending on where it is run.
Eric Haszlakiewicz [Mon, 27 Jun 2016 04:28:34 +0000 (04:28 +0000)]
Issue #113: Add more files to EXTRA_DIST and a dist-hook to get distcheck to at least not fail.
Eric Haszlakiewicz [Mon, 27 Jun 2016 03:46:38 +0000 (03:46 +0000)]
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.
Eric Haszlakiewicz [Mon, 27 Jun 2016 03:09:42 +0000 (23:09 -0400)]
Merge pull request #238 from nagamalli9999/master
linkhash.c: optimised the table_free path
Eric Haszlakiewicz [Sun, 26 Jun 2016 02:20:05 +0000 (02:20 +0000)]
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
Eswar Yaganti [Sat, 25 Jun 2016 17:35:41 +0000 (23:05 +0530)]
linkhash.h: removed redundant params from comments
Eswar Yaganti [Sat, 25 Jun 2016 17:20:36 +0000 (22:50 +0530)]
linkhash.c: optimised the table_free path
Eric Haszlakiewicz [Sat, 11 Jun 2016 18:18:46 +0000 (18:18 +0000)]
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.
Eric Haszlakiewicz [Wed, 8 Jun 2016 03:24:59 +0000 (03:24 +0000)]
Issue #175: disable the fast-and-loose code in hashlittle() when running with AddressSanitizer.
Eric Haszlakiewicz [Wed, 8 Jun 2016 02:36:13 +0000 (02:36 +0000)]
Mention that we're aiming to follow RFC 7159 now.
Cause README.md to show up in Doxygen output as the main page.
Eric Haszlakiewicz [Tue, 7 Jun 2016 20:47:40 +0000 (16:47 -0400)]
Merge pull request #232 from NeoRaider/size_t2
tests/tests1: fix printf format for size_t arguments
Matthias Schiffer [Tue, 7 Jun 2016 08:49:42 +0000 (10:49 +0200)]
tests/tests1: fix printf format for size_t arguments
Change %d to %llu and add cast to unsigned long long for size_t arguments,
otherwise compilation will fail with errors like:
test1.c:70:15: error: format ‘%d’ expects argument of type ‘int’, but argument 2 has type ‘size_t {aka long unsigned int}’ [-Werror=format=]
%zu is avoided to stay compatible with old libc versions (like old Visual
Studio).
Eric Haszlakiewicz [Tue, 7 Jun 2016 04:13:15 +0000 (04:13 +0000)]
Copy over note about the 0.12.1 release to the master branch.
Eric Haszlakiewicz [Tue, 7 Jun 2016 03:26:46 +0000 (03:26 +0000)]
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.
Eric Haszlakiewicz [Tue, 7 Jun 2016 02:59:38 +0000 (22:59 -0400)]
Merge pull request #230 from ebassi/master
Use stdint.h to check for size_t size
Eric Haszlakiewicz [Tue, 7 Jun 2016 02:55:44 +0000 (22:55 -0400)]
Merge pull request #233 from NeoRaider/size_t3
Include stddef.h in json_object.h
Eric Haszlakiewicz [Tue, 7 Jun 2016 02:54:40 +0000 (22:54 -0400)]
Merge pull request #234 from NeoRaider/userdata
Add public API to use userdata independently of custom serializer
Michael Clark [Mon, 6 Jun 2016 20:11:16 +0000 (08:11 +1200)]
Remove reference to svn.metaparadigm.com
svn.metaparadigm.com no longer exists so it is not possible to use source from there.
Matthias Schiffer [Sun, 29 May 2016 03:54:57 +0000 (05:54 +0200)]
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.
Matthias Schiffer [Sun, 29 May 2016 02:54:38 +0000 (04:54 +0200)]
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.
Matthias Schiffer [Sun, 29 May 2016 03:19:50 +0000 (05:19 +0200)]
Include stddef.h in json_object.h
It is needed for size_t.
Emmanuele Bassi [Mon, 23 May 2016 09:18:59 +0000 (10:18 +0100)]
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.
Eric Haszlakiewicz [Mon, 23 May 2016 03:02:34 +0000 (03:02 +0000)]
Issue #142: un-deprecate json_object_object_get(), but note why you might want to use json_object_object_get_ex() instead.
Eric Haszlakiewicz [Mon, 23 May 2016 02:37:09 +0000 (02:37 +0000)]
Issue #205: use _strdup instead of strdup on Windows.
Eric Haszlakiewicz [Mon, 23 May 2016 02:12:51 +0000 (02:12 +0000)]
Merge branch 'doctaweeks-fixes-for-upstream'
Eric Haszlakiewicz [Mon, 23 May 2016 02:10:58 +0000 (02:10 +0000)]
Fix a few places that needed adjustment for the size_t changes, including updating the range checks to use a calculated SIZE_T_MAX.
Eric Haszlakiewicz [Mon, 23 May 2016 02:08:28 +0000 (02:08 +0000)]
Merge branch 'fixes-for-upstream' of https://github.com/doctaweeks/json-c into doctaweeks-fixes-for-upstream
Eric Haszlakiewicz [Wed, 18 May 2016 20:10:27 +0000 (16:10 -0400)]
Merge pull request #193 from jplitza/master
Make serialization format of doubles configurable
Jan-Philipp Litza [Fri, 6 May 2016 14:12:44 +0000 (16:12 +0200)]
Export json_object_double_to_json_string() and use custom format string
Jan-Philipp Litza [Fri, 6 May 2016 14:12:19 +0000 (16:12 +0200)]
Fix code in docs for json_object_new_double_s()
Eric Haszlakiewicz [Sat, 30 Apr 2016 19:09:45 +0000 (19:09 +0000)]
Add tests for the json_object_array_del_idx() function.
Eric Haszlakiewicz [Sat, 30 Apr 2016 18:53:16 +0000 (18:53 +0000)]
Merge branch 'Protovision-master'
Eric Haszlakiewicz [Sat, 30 Apr 2016 18:52:47 +0000 (18:52 +0000)]
Merge branch 'master' of https://github.com/Protovision/json-c into Protovision-master
Eric Haszlakiewicz [Sat, 30 Apr 2016 18:45:16 +0000 (14:45 -0400)]
Merge pull request #216 from Jehan/master
configure: check realloc with AC_CHECK_FUNCS() to fix cross-compilation.
Eric Haszlakiewicz [Sat, 30 Apr 2016 18:44:29 +0000 (14:44 -0400)]
Merge pull request #218 from sevan/patch-1
Use a macro to indicate C99 to the compiler
Eric Haszlakiewicz [Sat, 30 Apr 2016 18:44:05 +0000 (14:44 -0400)]
Merge pull request #219 from rouault/low_heap_robustness_fixes
Fix various potential null ptr deref and int32 overflows
Eric Haszlakiewicz [Sat, 30 Apr 2016 18:42:16 +0000 (14:42 -0400)]
Merge pull request #220 from hschaa/master
Add utility function for comparing json_objects
Eric Haszlakiewicz [Sat, 30 Apr 2016 18:40:30 +0000 (14:40 -0400)]
Merge pull request #222 from chenha0/master
Fix issue #221: JSON_C_TO_STRING_NOSLASHESCAPE works incorrectly
Eric Haszlakiewicz [Sat, 30 Apr 2016 18:36:02 +0000 (14:36 -0400)]
Merge pull request #223 from minaguib/master
Clarify json_object_get_string documentation of NULL handling & return
Mina Naguib [Mon, 8 Feb 2016 01:55:25 +0000 (20:55 -0500)]
Clarify json_object_get_string documentation of NULL handling & returning
chenha0 [Thu, 21 Jan 2016 12:11:40 +0000 (20:11 +0800)]
Fix issue #221: JSON_C_TO_STRING_NOSLASHESCAPE works incorrectly
Tests added.
Helmut Schaa [Wed, 13 Jan 2016 14:40:08 +0000 (15:40 +0100)]
Add some basic tests for verifying json_object_equal behavior
Do some basic checks on ints, doubles, strings, arrays and "complex" objects.
Helmut Schaa [Wed, 13 Jan 2016 14:40:02 +0000 (15:40 +0100)]
Add utility function for comparing json_objects
Even Rouault [Mon, 11 Jan 2016 11:15:54 +0000 (12:15 +0100)]
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.
Sevan Janiyan [Tue, 5 Jan 2016 11:43:17 +0000 (11:43 +0000)]
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
Jehan [Fri, 1 Jan 2016 17:35:14 +0000 (18:35 +0100)]
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.
Eric Haszlakiewicz [Sat, 26 Dec 2015 21:42:18 +0000 (21:42 +0000)]
Add const qualifiers to several functions that don't modify the json_object.
Eric Haszlakiewicz [Wed, 9 Dec 2015 03:20:42 +0000 (21:20 -0600)]
Issue #137: remove config.h.in from change control.
Eric Haszlakiewicz [Wed, 9 Dec 2015 02:51:06 +0000 (20:51 -0600)]
Eric Haszlakiewicz [Mon, 30 Nov 2015 02:24:50 +0000 (21:24 -0500)]
Merge pull request #209 from rgerhards/fix-regression
fix regression from
2d549662be832da838aa063da2efa78ee3b99668
Eric Haszlakiewicz [Sun, 29 Nov 2015 02:00:30 +0000 (20:00 -0600)]
Fix issue #201: add a JSON_C_TO_STRING_NOSLASHESCAPE flag to turn off escaping of forward slashes.
Eric Haszlakiewicz [Sat, 28 Nov 2015 18:58:07 +0000 (13:58 -0500)]
Merge pull request #198 from unmole/master
Fix possible memory leak and remove superfluous NULL checks before free()
Daniel M. Weeks [Fri, 22 Aug 2014 16:16:45 +0000 (12:16 -0400)]
Use size_t for json object array ops
Daniel M. Weeks [Fri, 22 Aug 2014 14:56:59 +0000 (10:56 -0400)]
Use size_t for array list length and size
Rainer Gerhards [Thu, 19 Nov 2015 10:05:15 +0000 (11:05 +0100)]
fix regression from
2d549662be832da838aa063da2efa78ee3b99668
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.
Eric Haszlakiewicz [Sun, 15 Nov 2015 04:31:15 +0000 (23:31 -0500)]
Merge pull request #199 from Nzbuu/fix_vs_build
Fix build in Visual Studio
Eric Haszlakiewicz [Sun, 15 Nov 2015 04:30:38 +0000 (23:30 -0500)]
Merge pull request #200 from Nzbuu/ci_build
Add build scripts for CI platforms
James Myatt [Thu, 5 Nov 2015 13:50:30 +0000 (13:50 +0000)]
Appveyor: Visual Studio v140 no longer fails
James Myatt [Thu, 5 Nov 2015 13:41:42 +0000 (13:41 +0000)]
Appveyor: Create artefact with library and include files only
Eric Haszlakiewicz [Fri, 23 Oct 2015 02:16:40 +0000 (02:16 +0000)]
Use AX_APPEND_COMPILE_FLAGS() to check the various compile flags, such as -Wall, to ensure the compile supports.
Eric Haszlakiewicz [Thu, 22 Oct 2015 02:57:13 +0000 (02:57 +0000)]
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.
James Myatt [Fri, 9 Oct 2015 22:50:51 +0000 (23:50 +0100)]
Travis: add osx and clang builds
James Myatt [Fri, 9 Oct 2015 22:48:06 +0000 (23:48 +0100)]
Travis: skip install step
James Myatt [Fri, 9 Oct 2015 22:46:19 +0000 (23:46 +0100)]
Add Travis build script
James Myatt [Fri, 11 Sep 2015 12:03:36 +0000 (13:03 +0100)]
Appveyor: Allow failing builds against newest toolset
James Myatt [Fri, 11 Sep 2015 11:20:44 +0000 (12:20 +0100)]
Add initial version of Appveyor build script
James Myatt [Fri, 9 Oct 2015 22:24:55 +0000 (23:24 +0100)]
Fix build in Visual Studio
Anmol Sarma [Thu, 1 Oct 2015 08:44:03 +0000 (14:14 +0530)]
Remove superfluous NULL checks
Anmol Sarma [Thu, 1 Oct 2015 08:39:09 +0000 (14:09 +0530)]
Fix possible memory leak