DongHun Kwak [Mon, 16 Oct 2017 08:46:18 +0000 (17:46 +0900)]
Merge tag 'upstream/0.12.1' into tizen
upstream/0.12.1
Change-Id: Iad133276e57cadaacdf32a8012a72c0b455d2ee1
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
DongHun Kwak [Fri, 29 Sep 2017 02:55:20 +0000 (11:55 +0900)]
Imported Upstream version 0.12.1
Change-Id: I82deb7d4d1814ccadc78c8c5fa3ae7cb7acdb9f5
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
DongHun Kwak [Tue, 11 Jul 2017 02:47:14 +0000 (11:47 +0900)]
Add unit test
[ 75s]
============================================================================
[ 75s] Testsuite summary for json-c 0.12
[ 75s]
============================================================================
[ 75s] # TOTAL: 12
[ 75s] # PASS: 12
[ 75s] # SKIP: 0
[ 75s] # XFAIL: 0
[ 75s] # FAIL: 0
[ 75s] # XPASS: 0
[ 75s] # ERROR: 0
[ 75s]
============================================================================
[Model]
[BinType] AP
[Customer] OPEN
[Issue#] N/A
[Request] N/A
[Occurrence Version] N/A
[Problem]
[Cause & Measure]
[Checking Method] N/A
[Team] Open Source Management and Setting Part
[Developer] dh0128.kwak
[Solution company] Samsung
[Change Type] N/A
Change-Id: Ifd16cd617d92862c1787d618c651fd537805af1d
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
DongHun Kwak [Mon, 10 Jul 2017 08:26:43 +0000 (17:26 +0900)]
Issue #275: fix out of bounds read when handling unicode surrogate pairs.
Change-Id: Ib3075623b4a251bed5e363e858a73e6913d973a4
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
DongHun Kwak [Tue, 11 Apr 2017 05:29:13 +0000 (14:29 +0900)]
Using license macro
[Model] ALL
[BinType] AP
[Customer] OPEN
[Issue#] N/A
[Request] N/A
[Occurrence Version] N/A
[Problem] Using license macro
[Cause & Measure] Using license macro
[Checking Method] N/A
[Team] Open Source Management and Setting Part
[Developer] dh0128.kwak
[Solution company] Samsung
[Change Type] N/A
Change-Id: I79f51b0a247edec06920757a9a81673ff6b1a511
Slava Barinov [Wed, 15 Jun 2016 08:49:18 +0000 (11:49 +0300)]
ASan support defines added
Change-Id: Idc74911659a8a5a31d97c4bfd9d043cf2c80c62f
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
DongHun Kwak [Fri, 30 Oct 2015 07:19:44 +0000 (16:19 +0900)]
Adjust tizen patch
- fix json-c version at spec file
- Avoid duplicated symbol resolving (json_object_get_type)
- delete .gitignore file
Change-Id: Iaa662bcc1a1a90fff01781053f8f11235b2ef1b8
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
DongHun Kwak [Fri, 30 Oct 2015 05:53:04 +0000 (14:53 +0900)]
Merge branch 'upstream' into tizen
Change-Id: I6038817a084efa0052585d15a9ddace7f32c360c
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
MyoungJune Park [Tue, 27 Oct 2015 06:10:01 +0000 (15:10 +0900)]
avoid incorrect symbol resolving between json-glib and json-c
Change-Id: Ia58e3e82a6015b6eed15525e5acc87df56d9b8ea
Signed-off-by: MyoungJune Park <mj2004.park@samsung.com>
DongHun Kwak [Tue, 27 Oct 2015 01:23:00 +0000 (10:23 +0900)]
Imported Upstream version 0.12
Change-Id: If1adf769b75f62becce10d891d0974b9989e6979
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
DongHun Kwak [Tue, 1 Sep 2015 05:06:59 +0000 (14:06 +0900)]
Bump to 0.12
Change-Id: Ibaeaeefd08c4a22e8294371867a35dd72dae57c1
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Kévin THIERRY [Mon, 3 Nov 2014 14:17:15 +0000 (15:17 +0100)]
Bump to version 0.11
Use upstream git repo instead of pristin-tar.
Build with "-j1" to prevent an existing race condition.
Remove duplicate entry for "json_object_iterator.h" which leads to
installation failure.
Bug-Tizen: TC-1831
Change-Id: I6b548537816b1d2b95ccbcea9087050e970dfd5e
Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
Alexandru Cornea [Fri, 28 Jun 2013 21:26:47 +0000 (00:26 +0300)]
resetting manifest requested domain to floor
Anas Nashif [Tue, 26 Feb 2013 14:48:44 +0000 (06:48 -0800)]
add json_object_iterator.h to headers
Anas Nashif [Tue, 26 Feb 2013 14:21:57 +0000 (06:21 -0800)]
Update to 0.10
Anas Nashif [Mon, 26 Nov 2012 21:51:06 +0000 (13:51 -0800)]
package licenses as %license
Anas Nashif [Mon, 5 Nov 2012 17:33:41 +0000 (09:33 -0800)]
add packaging, remove patches
Anas Nashif [Mon, 5 Nov 2012 17:31:35 +0000 (09:31 -0800)]
adapt baselibs
Anas Nashif [Mon, 5 Nov 2012 17:28:58 +0000 (09:28 -0800)]
add packaging
Anas Nashif [Mon, 5 Nov 2012 17:28:19 +0000 (09:28 -0800)]
add packaging
Eric Haszlakiewicz [Wed, 3 Apr 2013 02:04:18 +0000 (21:04 -0500)]
Drop the libtool versions back down a bit to avoid changing the major number of the library. Programs compiled against v0.10 should work ok with v0.11.
Eric Haszlakiewicz [Mon, 1 Apr 2013 02:34:53 +0000 (21:34 -0500)]
Regen the doc pages using the right version for the 0.11 release.
Eric Haszlakiewicz [Mon, 1 Apr 2013 02:33:59 +0000 (21:33 -0500)]
Bump the version numbers for the 0.11 release.
Eric Haszlakiewicz [Mon, 1 Apr 2013 02:10:01 +0000 (21:10 -0500)]
Add the 0.11 release doxygen-generated docs to source control.
Eric Haszlakiewicz [Mon, 1 Apr 2013 02:02:23 +0000 (21:02 -0500)]
Add automake/autoconf generated files for the 0.11 release.
Eric Haszlakiewicz [Mon, 1 Apr 2013 01:58:54 +0000 (20:58 -0500)]
Merge branch 'master' of https://github.com/json-c/json-c
Eric Haszlakiewicz [Mon, 1 Apr 2013 01:58:30 +0000 (20:58 -0500)]
Bump up the version in the release checklist to 0.11
Eric Haszlakiewicz [Mon, 1 Apr 2013 01:57:08 +0000 (20:57 -0500)]
Update the changelog with changes since the 0.10 release.
Eric Haszlakiewicz [Mon, 1 Apr 2013 01:34:28 +0000 (20:34 -0500)]
Update config.h.in to add the HAVE_SETLOCALE and HAVE_LOCALE_H lines.
Eric Haszlakiewicz [Mon, 1 Apr 2013 01:05:36 +0000 (20:05 -0500)]
Issue #15: add a way to set a JSON_TOKENER_STRICT flag to forbid commas at the end of arrays and objects.
Eric Haszlakiewicz [Sun, 24 Mar 2013 00:06:03 +0000 (17:06 -0700)]
Merge pull request #73 from ghazel/master
one definition of json_object_object_foreach only works on c99 and later
Greg Hazel [Tue, 19 Mar 2013 23:26:12 +0000 (16:26 -0700)]
one definition of json_object_object_foreach only works on c99 and later
Eric Haszlakiewicz [Sat, 16 Mar 2013 04:19:48 +0000 (21:19 -0700)]
Merge pull request #71 from WillDignazio/master
Fix Broken Build, Check ADVANCE_CHAR
William Dignazio [Thu, 7 Mar 2013 01:18:14 +0000 (20:18 -0500)]
Fix broken build by using ADVANCE_CHAR macro return.
We forget to check or use the return value of the ADVANCE_CHAR macro,
and upon compilation an error is thrown because of its lack of use. This
patch checks to see if the macro was successful, and if not replaces the
offending character with a replacement.
William Dignazio [Wed, 6 Mar 2013 17:29:33 +0000 (12:29 -0500)]
Rename misnomer POP_CHAR to PEEK_CHAR.
While parsing token data, we use the POP_CHAR macro to 'peek' at
character data. This behaviour is noted in the comments for the macro,
yet the definition is left as 'pop'. Changing to PEEK_CHAR does not
imply that the character being observed is removed.
Eric Haszlakiewicz [Mon, 4 Mar 2013 04:34:34 +0000 (20:34 -0800)]
Merge pull request #70 from tg--/master
rename AM_CONFIG_HEADER to AC_CONFIG_HEADER
Eric Haszlakiewicz [Mon, 4 Mar 2013 04:26:28 +0000 (22:26 -0600)]
Issue #68: use -std=gnu99 because some versions of gcc seem to think that -std=c99 also implies -ansi, which causes warnings and build breakage.
Thomas Gstädtner [Sat, 2 Mar 2013 23:17:25 +0000 (00:17 +0100)]
configure.in: mv AM_CONFIG_HEADER to AC_CONFIG_HEADER
the former has been deprecated and does not work on newer autoconf
versions.
Eric Haszlakiewicz [Wed, 27 Feb 2013 03:14:07 +0000 (21:14 -0600)]
Include the test_locale test in the tests that run.
Eric Haszlakiewicz [Wed, 27 Feb 2013 03:09:10 +0000 (21:09 -0600)]
Merge branch 'remicollet-issue-float'
Conflicts:
json_util.c
Anas Nashif [Tue, 26 Feb 2013 14:15:07 +0000 (06:15 -0800)]
Imported Upstream version 0.10
Eric Haszlakiewicz [Thu, 21 Feb 2013 18:32:29 +0000 (12:32 -0600)]
Mark the "val" variable in json_object_object_foreach as unused so the compiler doesn't complain. Fix warnings in the testReplaceExisting test.
Eric Haszlakiewicz [Sat, 9 Feb 2013 23:35:33 +0000 (17:35 -0600)]
Add a runtime check to see if parse_int64 needs to workaround sscanf bugs. If that workaround is not needed parsing is nearly twice as fast.
Eric Haszlakiewicz [Sat, 9 Feb 2013 22:35:24 +0000 (16:35 -0600)]
Enable -Werror and fix a number of minor warnings that existed.
Eric Haszlakiewicz [Sat, 9 Feb 2013 22:18:05 +0000 (16:18 -0600)]
Add a comment briefly describing json_object_object_length()
Eric Haszlakiewicz [Sat, 9 Feb 2013 22:14:33 +0000 (14:14 -0800)]
Merge pull request #62 from ghazel/master
json_object_object_length
Eric Haszlakiewicz [Sat, 9 Feb 2013 21:59:51 +0000 (13:59 -0800)]
Merge pull request #66 from ichernev/fix-test-parse
Fixed test_parse for \f
Iskren Chernev [Tue, 29 Jan 2013 03:06:49 +0000 (19:06 -0800)]
Fixed test_parse for \f
Greg Hazel [Fri, 11 Jan 2013 09:36:55 +0000 (01:36 -0800)]
add json_object_object_length
Eric Haszlakiewicz [Wed, 9 Jan 2013 23:26:42 +0000 (15:26 -0800)]
Merge pull request #60 from ghazel/master
rename _errno
Greg Hazel [Fri, 4 Jan 2013 00:54:04 +0000 (16:54 -0800)]
rename _errno
Eric Haszlakiewicz [Wed, 2 Jan 2013 18:08:44 +0000 (10:08 -0800)]
Merge pull request #58 from Abioy/master
escape '\f' in json_escape_str
Abioy [Mon, 24 Dec 2012 14:22:05 +0000 (22:22 +0800)]
escape '\f' in json_escape_str
'\f' is a llegal char and should be escape in printbuf
Eric Haszlakiewicz [Sun, 23 Dec 2012 17:09:20 +0000 (11:09 -0600)]
Bump the version up to 0.10.99 to make it clear that the master branch is beyond anything on the 0.10 branch.
Eric Haszlakiewicz [Sun, 23 Dec 2012 16:59:52 +0000 (10:59 -0600)]
Merge branch 'master' of https://github.com/json-c/json-c
Eric Haszlakiewicz [Sun, 23 Dec 2012 16:57:44 +0000 (10:57 -0600)]
Add a json_c_version.h header (included from json.h), and several macros and functions for retrieving the json-c version at compile-time and run-time.
Eric Haszlakiewicz [Sun, 23 Dec 2012 16:39:46 +0000 (08:39 -0800)]
Merge pull request #51 from remicollet/issue-dyndepth
Make maximum recursion depth a runtime option
Eric Haszlakiewicz [Sun, 23 Dec 2012 16:27:14 +0000 (10:27 -0600)]
Update the release checklist to include the INSTALL file, and adjust the git command to add the doc directory.
Eric Haszlakiewicz [Sun, 23 Dec 2012 16:25:03 +0000 (10:25 -0600)]
Revert the test_null test back to emitted to stdout, and update the expected output to match.
Eric Haszlakiewicz [Sun, 23 Dec 2012 16:23:13 +0000 (08:23 -0800)]
Merge pull request #56 from TheCount/develop
Some houskeeping
Alexander Klauer [Wed, 19 Dec 2012 12:55:02 +0000 (13:55 +0100)]
More warnings, fewer errors, C99
Alexander Klauer [Wed, 19 Dec 2012 12:16:38 +0000 (13:16 +0100)]
Prepend DESTDIR to paths for staged installs
Alexander Klauer [Wed, 19 Dec 2012 09:52:50 +0000 (10:52 +0100)]
Write additional test info to stderr instead of stdout so as not to mar the expected output
Alexander Klauer [Wed, 19 Dec 2012 09:46:35 +0000 (10:46 +0100)]
Fixed memory leak in testReplaceExisting
Alexander Klauer [Wed, 19 Dec 2012 09:31:39 +0000 (10:31 +0100)]
Make macro json_object_object_foreach multiple-use safe
Alexander Klauer [Wed, 19 Dec 2012 08:40:10 +0000 (09:40 +0100)]
Remove and ignore autogenerated installation instructions
Alexander Klauer [Wed, 19 Dec 2012 08:38:45 +0000 (09:38 +0100)]
Ignore editor swap files
Alexander Klauer [Tue, 18 Dec 2012 17:53:04 +0000 (18:53 +0100)]
Ignore doc dir for now
Alexander Klauer [Tue, 18 Dec 2012 17:46:24 +0000 (18:46 +0100)]
Library is now called libjson-c
Alexander Klauer [Tue, 18 Dec 2012 17:45:39 +0000 (18:45 +0100)]
Need to explicitly remove include/json-c directory
Alexander Klauer [Tue, 18 Dec 2012 17:44:52 +0000 (18:44 +0100)]
-d test is useless as symlinks are dereferenced
Alexander Klauer [Tue, 18 Dec 2012 17:27:39 +0000 (18:27 +0100)]
Ignore valgrind output files
Remi Collet [Thu, 13 Dec 2012 10:46:04 +0000 (11:46 +0100)]
probably worth an option for this
Remi Collet [Thu, 13 Dec 2012 10:22:31 +0000 (11:22 +0100)]
Save space, drop unuseful trailing zeroes
Remi Collet [Thu, 13 Dec 2012 10:16:03 +0000 (11:16 +0100)]
Simple fix to double encode
Remi Collet [Thu, 13 Dec 2012 08:47:33 +0000 (09:47 +0100)]
move locale change to be global for perf
Eric Haszlakiewicz [Sun, 9 Dec 2012 22:32:11 +0000 (16:32 -0600)]
Fix issue #53 - ensure explicit length string are still NUL terminated, and fix json_tokener_parse() to work properly with embedded unicode \u0000 values in strings.
Adjust test_null to check for this case.
See also http://bugs.debian.org/687269
Eric Haszlakiewicz [Sun, 9 Dec 2012 21:46:35 +0000 (15:46 -0600)]
Remove configure as part of maintainer-clean instead of distclean. Addresses issue #48.
Eric Haszlakiewicz [Sun, 9 Dec 2012 21:46:23 +0000 (15:46 -0600)]
Add PACKAGE_URL to config.h.in
Eric Haszlakiewicz [Thu, 29 Nov 2012 20:06:17 +0000 (15:06 -0500)]
Add a missing json_object_get() so we don't try to use a freed object in test1.
Eric Haszlakiewicz [Thu, 29 Nov 2012 19:29:55 +0000 (13:29 -0600)]
Fix a memory leak in the test_printbuf test.
Eric Haszlakiewicz [Thu, 29 Nov 2012 19:23:06 +0000 (13:23 -0600)]
Include json_object_iterator.c in the list of sources.
Remi Collet [Tue, 27 Nov 2012 10:06:49 +0000 (11:06 +0100)]
float parsing must be locale independent
Remi Collet [Tue, 27 Nov 2012 08:01:45 +0000 (09:01 +0100)]
Make maximum recursion depth a runtime option
Anas Nashif [Mon, 5 Nov 2012 17:28:19 +0000 (09:28 -0800)]
Imported Upstream version 0.9
Eric Haszlakiewicz [Sun, 21 Oct 2012 01:26:37 +0000 (20:26 -0500)]
Make it safe to delete keys while iterating with the json_object_object_foreach macro.
Eric Haszlakiewicz [Sun, 21 Oct 2012 01:10:15 +0000 (20:10 -0500)]
Reformat the json_object_object_foreach macro so it is readable, and document what is allowed to be done with the object while iterating.
Eric Haszlakiewicz [Thu, 18 Oct 2012 22:16:36 +0000 (17:16 -0500)]
Reformat json_object_object_get() and json_object_object_get_ex().
Eric Haszlakiewicz [Thu, 18 Oct 2012 22:14:41 +0000 (17:14 -0500)]
Fix json_object_object_get() so it returns NULL if the incoming json_object is NULL.
Eric Haszlakiewicz [Thu, 18 Oct 2012 22:10:09 +0000 (17:10 -0500)]
Change json_object_put to return 1 if the object passed was actually freed. (or 0 if only the reference count was decremented)
Eric Haszlakiewicz [Mon, 17 Sep 2012 01:49:22 +0000 (20:49 -0500)]
Fix a memory leak in test1 with respect to how json_object_object_del was used.
Eric Haszlakiewicz [Mon, 17 Sep 2012 01:43:29 +0000 (20:43 -0500)]
Reformat the test sources. No functional change.
Eric Haszlakiewicz [Mon, 10 Sep 2012 22:32:14 +0000 (17:32 -0500)]
Fix the home page in the README, and add a list of prerequisites.
Eric Haszlakiewicz [Mon, 10 Sep 2012 02:24:47 +0000 (19:24 -0700)]
Merge pull request #44 from lastquestion/fix_gnu_macosx
Add an autoconf test to test whether the .section .gnu<warning>
Lin Xu [Mon, 10 Sep 2012 00:33:35 +0000 (17:33 -0700)]
Add an autoconf test to test whether the .section .gnu<warning>
works with the linker on the system, and define _warn_references
to nothing if not.
Eric Haszlakiewicz [Sun, 9 Sep 2012 18:53:12 +0000 (13:53 -0500)]
Update the set_serializer test to match the actual output.
Eric Haszlakiewicz [Sun, 2 Sep 2012 20:21:56 +0000 (15:21 -0500)]
Add a json_set_serializer() function to allow the string output of a json_object to be customized.
Eric Haszlakiewicz [Mon, 30 Jul 2012 01:02:00 +0000 (20:02 -0500)]
Add my copyright.
Eric Haszlakiewicz [Mon, 30 Jul 2012 01:00:28 +0000 (20:00 -0500)]
Ignore the tests/testReplaceExisting binary.
Eric Haszlakiewicz [Sun, 29 Jul 2012 23:43:55 +0000 (18:43 -0500)]
Note the rename in the ChangeLog, and update the instructions in the README file.