5a46a3b76d
json_pointer: introduce json_pointer_get_internal() for internal usage
Alexandru Ardelean
2021-04-20 16:23:47 +03:00
43d3118935
json_pointer: convert index to size_t type
Alexandru Ardelean
2021-04-24 17:06:17 +03:00
d5c5b2caec
tests: test1: add test cases for json_object_array_insert_idx()
Alexandru Ardelean
2021-04-20 16:07:26 +03:00
a86d7a8f5a
json_object: introduce json_object_array_insert_idx() API function
Alexandru Ardelean
2021-04-16 16:12:22 +03:00
5568916eb1
json_pointer: fix comments about printf() variants of set/get()
Alexandru Ardelean
2021-04-22 11:19:07 +03:00
71d845e819
Issue #668: add the option to specify "cmake -DUSELOCALE_NEEDS_FREELOCALE=1" to work around a bug in older versions of FreeBSD (<12.4).
Eric Hawicz
2023-07-30 13:38:15 -04:00
c8b0a90e95
Issue #808: turn off -Wshorten-64-to-32 for clang builds (aka iOS builds) to workaround "implicit conversion loses integer precision" warnings.
Eric Hawicz
2023-07-30 11:38:01 -04:00
fa7308b3de
Run travis builds using iOS flags, to attempt to reproduce Issue #808.
issue808-ios-build
Eric Hawicz
2023-07-30 10:23:21 -04:00
9b36c72945
Merge pull request #772 from cosmo-ray/color
Eric Hawicz
2023-07-13 18:04:48 -04:00
bdfdb5fe10
Skip apps when we're included in someone else's build. Inspired by ssrlive in PR #813.
Eric Hawicz
2023-07-06 20:56:49 -04:00
11311ed2a3
Fix the -f option to apps/json_parse, add a -F <arg> option to specify arbitrary flags to pass to json_object_to_json_string_ext().
Eric Hawicz
2023-07-04 12:00:31 -04:00
e9d3ab209a
Merge pull request #759 from c3h2-ctf/truncation
Eric Hawicz
2023-07-04 11:45:57 -04:00
4d529f92dc
Issue #688: Only exclude generated doc/* files, keep the CMakeLists.txt, etc... so the nodoc tarball can still be built.
Eric Haszlakiewicz
2023-07-01 18:02:00 +00:00
aadde421a5
Merge pull request #625 from besser82/topic/besser82/json-c-0.13/rdrand_fixes
json-c-0.13
Eric Hawicz
2023-06-28 18:01:58 -04:00
5a310ba1a6
Merge pull request #624 from besser82/topic/besser82/json-c-0.14/rdrand_fixes
json-c-0.14
Eric Hawicz
2023-06-28 18:01:39 -04:00
188d1e3dda
Merge pull request #612 from besser82/topic/besser82/json-c-0.11/CVE-2020-12762
json-c-0.11
Eric Hawicz
2023-06-28 17:50:55 -04:00
d0f32a5a43
Stop linking a copy of _json_c_strerror() (strerror_override.c) into the tests. That hasn't been needed since since commit 6068d3f, which changed that code to check an env var instead ("_JSON_C_STRERROR_ENABLE"). Fixes issue #812, about dup symbols in static builds with clang.
Eric Haszlakiewicz
2023-03-28 23:08:39 +00:00
efd536af48
Merge pull request #810 from dijonkitchen/patch-1
Eric Hawicz
2023-03-10 14:54:44 -05:00
4d5507f5dc
docs: update to Internet Standard reference
JC (Jonathan Chen)
2023-03-10 11:10:29 -05:00
d1716fe431
Bump up the minimum cmake version to 3.9. This gets us up to a version that supports features we're already using (i.e. add_compile_options), but stops short of a cmake that requires c++11, which some OSes still don't support. Closes issue #774
Eric Haszlakiewicz
2023-02-23 01:01:14 +00:00
1741bcd3ea
Issue #570: note brief instructions for building on Android.
Eric Haszlakiewicz
2023-01-05 00:25:09 +00:00
343f24f920
Merge pull request #804 from yrashk/cmp-0042
Eric Hawicz
2022-12-27 09:32:33 -05:00
6ec5e5842d
Merge pull request #803 from yrashk/patch-2
Eric Hawicz
2022-12-27 09:26:30 -05:00
b6ba9429d0
Merge pull request #802 from yrashk/patch-1
Eric Hawicz
2022-12-27 09:25:58 -05:00
3cc0c47221
Problem: cmake 3.25.1 warns about CMP0042 not being set
Yurii Rashkovskii
2022-12-23 14:59:59 -08:00
bc35549f90
Update expected output for test_parse, missed in the previous commit.
Eric Haszlakiewicz
2022-10-30 19:42:42 +00:00
d6f46ae104
Explicitly check for integer overflow/underflow when parsing integers with JSON_TOKENER_STRICT.
Eric Haszlakiewicz
2022-10-30 19:29:15 +00:00
c50bf9df9c
Apply same EINVAL handling to json_parse_uint64() as was done for json_parse_int64(). Document that overflow/underflow for these functions is not an error, but sets errno=ERANGE.
Eric Haszlakiewicz
2022-10-30 03:25:32 +00:00
57bef5edc4
Issue #792 - set errno=EINVAL if parsing the string in json_parse_int64 fails, to match the docs for json_object_get_int.
Eric Haszlakiewicz
2022-10-26 02:19:38 +00:00
777dd06be8
Merge pull request #790 from Sarcares/patch-1
Eric Hawicz
2022-09-13 22:15:48 -04:00
84248a7884
Small update to README file
Luca Mannella
2022-09-12 17:29:47 +02:00
aff2b83a07
Note that the current release is 0.16
Eric Haszlakiewicz
2022-08-26 23:29:44 +00:00
81f0807b63
Merge pull request #784 from rouault/get_time_seed_coverity_scan_silence
Eric Hawicz
2022-08-16 18:10:06 -04:00
57ea393004
get_time_seed(): silence warning emitted by Coverity Scan static analyzer
Even Rouault
2022-08-16 11:11:55 +02:00
9417f4e726
Merge pull request #783 from kraj/master
Eric Hawicz
2022-08-14 08:19:19 -04:00
257b29c991
json_pointer.c: Move idx_val declaration to top of function
Khem Raj
2022-08-14 00:46:28 -07:00
d1deed499f
json_inttypes.h: Define ssize_t on windows platforms
Khem Raj
2022-08-13 21:45:11 -07:00
6eca65617a
Fix build with clang-15+
Khem Raj
2022-08-13 20:37:03 -07:00
ac4dfa44cb
Merge pull request #782 from DimitriPapadopoulos/codespell
Eric Hawicz
2022-08-13 09:43:50 -04:00
9462c0a7b5
Fix typos found by codespell
Dimitri Papadopoulos
2022-08-13 15:47:40 +03:00
bdd5e03d6e
Apply some of the fixes from PR #740, although by using size_t instead of castings.
Eric Haszlakiewicz
2022-07-31 19:26:12 +00:00
4b0c6de760
Merge pull request #757 from c3h2-ctf/big
Eric Hawicz
2022-07-31 14:27:32 -04:00
253a5fa99d
Issue #705: disable locale handling when building for a uClibc system because its duplocale() function (intentionally) crashes.
Eric Haszlakiewicz
2022-07-30 20:27:35 +00:00
9749b0cb66
When serializing with JSON_C_TO_STRING_PRETTY set, keep the opening and closing curly or square braces on same line for empty objects or arrays. Issue #778.
Eric Haszlakiewicz
2022-07-30 19:27:14 +00:00
2e9b7456a5
Update Travis links to point at travis-ci.com instead of travis-ci.org
Eric Haszlakiewicz
2022-07-26 23:47:58 +00:00
5282e73600
Entirely drop mode bits from open(O_RDONLY) to avoid warnings on certain platforms. Fixes issue #779.
Eric Haszlakiewicz
2022-07-26 23:43:30 +00:00
8b35a78d29
Trim a few travis builds, update others to more recent toolchains.
Eric Haszlakiewicz
2022-07-24 20:37:14 +00:00
22773b1e51
Fix the expected output for test_set_serializer.
Eric Haszlakiewicz
2022-07-24 19:00:27 +00:00
16208fc01a
Add test to check for the memory leak mentioned in issue #781
Eric Haszlakiewicz
2022-07-24 18:59:26 +00:00
2a2d861bc0
Merge pull request #781 from dddaniel/master
Eric Hawicz
2022-07-24 14:15:42 -04:00
213bb5caa1
Fix memory leak with emtpy strings in json_object_set_string
Daniel Danzberger
2022-07-24 18:46:03 +02:00
d28ac67dde
Fix issue #775 - use a loop instead of list(TRANSFORM ...) to support cmake < 3.12.
Eric Haszlakiewicz
2022-06-27 02:15:24 +00:00
5d98f7825a
Merge pull request #776 from stoeckmann/typo
Eric Hawicz
2022-06-21 21:39:00 -04:00
6ee0a35a20
Fix #771/#768 by marking usage() as "noreturn" instead of using "FALLTHRU" in the case statement where it'd called.
Eric Haszlakiewicz
2022-06-13 01:02:53 +00:00
11546bfd07
Merge pull request #769 from An7ar35/issue-768
Eric Hawicz
2022-06-03 23:14:16 -04:00
5d00384e0d
missing 'FALLTHRU' added to sort out error messages when using "-Werror=implicit-fallthrough" flag
An7ar35
2022-06-01 12:36:33 +02:00
49c3721a5a
Unset NDEBUG so assert() is enabled in all tests. One more fix there when building with -DCMAKE_BUILD_TYPE=release.
Eric Haszlakiewicz
2022-05-30 15:39:54 +00:00
2f0942bdd7
Specify dependent libraries, including -lbsd, in a more consistent way so linking against a static json-c works better. Related issue #766 Use target_link_libraries, plus fill in Libs.private in json-c.pc so pkg-config --static --libs works appropriately. Also, only link against libbsd when arc4random is actually found there.
Eric Haszlakiewicz
2022-05-30 15:30:11 +00:00
6ba1adf8ef
Include the tests and apps directories at the _end_, since order in the cmake rules matters, and fix compile warnings now that we're building those sources with all the regular flags.
Eric Haszlakiewicz
2022-05-30 14:33:16 +00:00
86b46cac07
Add --disable-static and --disable-dynamic options to the cmake-configure script.
Eric Haszlakiewicz
2022-05-30 14:31:08 +00:00
f2fc1ca00a
Note the DSIABLE_JSON_POINTER and DISABLE_EXTRA_LIBS build options on the README
Eric Haszlakiewicz
2022-04-14 12:57:43 +00:00
acccefd770
Add a "Getting Help" section to the README.
Eric Haszlakiewicz
2022-04-14 12:55:32 +00:00
294efecc10
Update the doc links to point at 0.16. Drop broken link to oss.metaparadigm.com.
Eric Haszlakiewicz
2022-04-14 12:36:26 +00:00
76db5740f7
Add the 0.16 docs.
Eric Haszlakiewicz
2022-04-14 12:34:00 +00:00
de5a64888a
Update the master branch to version 16.99
Eric Haszlakiewicz
2022-04-14 12:29:39 +00:00
7e3eba72db
Clarify how to set the uploaded release tarballs to be publically readable.
Eric Haszlakiewicz
2022-04-14 12:17:59 +00:00
2c6358521a
Bump version to 0.16
Eric Haszlakiewicz
2022-04-14 01:10:39 +00:00
7d303478a4
Update the ChangeLog with recent changes, in preparation for a 0.16 release. Add a list of issues closed for this release.
Eric Haszlakiewicz
2022-04-14 00:21:13 +00:00
66dcdf549e
Add new authors since the 0.15 release, tweak instructions for how to update that list.
Eric Haszlakiewicz
2022-04-13 23:16:34 +00:00
4902f9cb87
Merge pull request #765 from jvoisin/patch-1
Eric Hawicz
2022-04-13 14:28:51 -04:00
558d48a6f3
Improve a bit the coverage of the fuzzer
Julien Voisin
2022-04-13 15:42:46 +02:00
46b58ad9e7
Fix issue #764: adjust test_util_file to match new output (changed in 6e53347)
Eric Haszlakiewicz
2022-04-08 22:58:24 +00:00
0b937f6173
Merge pull request #758 from c3h2-ctf/context
Eric Hawicz
2022-04-04 18:01:39 -04:00
65274cf3b5
Update issue templates
Eric Hawicz
2022-04-04 17:10:31 -04:00
0c0d901443
Preserve context if out of memory
Tobias Stoeckmann
2022-03-20 13:22:46 +01:00
e244146dfd
Remove single quote from #error line. Fixes issue #761
Eric Haszlakiewicz
2022-03-25 01:11:52 +00:00
a1c092bd7b
Merge pull request #760 from BonsaiYi/error
Eric Hawicz
2022-03-23 00:14:36 -04:00
Alexandru Ardelean