Eric Hawicz
7bca694b47
Merge pull request #884 from careles/mingw_win64-WIN32_LEAN_AND_MEAN-redefined
fix macro WIN32_LEAN_AND_MEAN redefined
8 months ago
Careles
51bcdd0000
fix macro WIN32_LEAN_AND_MEAN redefined
json-c as add_subdirectory and project cmakelists.txt has add_definitions(-DWIN32_LEAN_AND_MEAN)
8 months ago
Eric Hawicz
a304464807
Merge pull request #872 from GitMensch/patch-2
fix linkhash breaking -std=c89
9 months ago
Eric Hawicz
7b73916815
Merge pull request #847 from sacredbanana/amiga
Add support for Commodore Amiga
9 months ago
Eric Hawicz
ee83daa409
Merge pull request #882 from simonresch/handle-nan-to-int-conversion
Explicitly handle NaN values when converting to integer
9 months ago
Cameron Armstrong (Nightfox)
ca1a6b0cc9
Add support for MorphOS
1 year ago
Cameron Armstrong (Nightfox)
daff6eb746
Remove linking to libamiga and libc
1 year ago
Cameron Armstrong (Nightfox)
254b5abef8
Do not use duplocale if building for libnix because it isnt supported yet
1 year ago
Cameron Armstrong (Nightfox)
d31d635af1
Clean up CMakeLists.txt and remove Amiga specific locale.h guard
1 year ago
Cameron Armstrong (Nightfox)
743ebf53e5
Fix Readme
1 year ago
Cameron Armstrong
f928e7c0fa
Get working ror libnix and clib2
1 year ago
Cameron Armstrong
4feebc1cd6
Add support for Commodore Amiga
1 year ago
Eric Hawicz
961c31f8ed
Merge pull request #879 from janotomko/null
Handle NULL gracefully in json_tokener_free
9 months ago
Simon Resch
0c3588330a
Set error codes for truncating int conversions
json_object_get_int/int64/uint64() now sets errno to ERANGE when the source value
can't be represented in the target type.
10 months ago
Simon Resch
8c13801f2c
Explicitly handle NaN values when converting to int
Json objects of type double with the value NaN could cause undefined
behavior when casting double to int in `json_object_get_int`.
10 months ago
Eric Hawicz
c63d4a4194
Merge pull request #878 from 0xfadead/readme-fix-underline
Fix underline bug in README
10 months ago
Eric Hawicz
77bb5c54fc
Merge pull request #883 from simonresch/add-oss-fuzz-tests
Add fuzz tests for json_object/point/array apis
10 months ago
Simon Resch
839fbe0d63
Add fuzz tests for json_object/point/array apis
Extends the coverage of fuzz tests executed in OSS-Fuzz.
10 months ago
Eric Hawicz
ff8ed0f094
Issue #881 : don't allow json_tokener_new_ex() with a depth < 1
10 months ago
Eric Hawicz
565f181f65
Fix issue #875 : cast to unsigned char so bytes above 0x7f aren't interpreted as negative, which was causing the strict-mode control characters check to incorrectly trigger.
10 months ago
Ján Tomko
828c12b226
Handle NULL gracefully in json_tokener_free
Similarly to glibc's free, make json_tokener_free(NULL)
a no-op, to simplify cleanup paths.
Signed-off-by: Ján Tomko <jtomko@redhat.com>
11 months ago
Eric Hawicz
474ee12435
Fix the apps/json_parse "-s" (strict) option so it actually does something, and default to non-strict.
11 months ago
Awildidiot
d6b973e047
Fix underline bug in README
11 months ago
Eric Hawicz
07148f33a1
Merge pull request #873 from esiaero/master
Correct year in changelog for 0.18 release
11 months ago
Evan Si
2ec0b87b58
Correct year in changelog for 0.18 release
11 months ago
Simon Sobisch
6aab3da807
fix linkhash breaking -std=c89
making the definition of _LH_INLINE depending on __STDC_VERSION__, not on a specific compiler
1 year ago
Eric Hawicz
c793374f16
Update openssl command to work for newer versions of openssl.
1 year ago
Eric Hawicz
e9bd26d568
Update the master branch to version 0.18.99
1 year ago
Eric Haszlakiewicz
7ebdc4ddf8
Update abi-check.sh to compare 0.16 and 0.18
1 year ago
Eric Hawicz
87900c0a2e
Fix the expected output for test_parse
1 year ago
Eric Hawicz
e5ca4d3b3d
Update ChangeLog, AUTHORS and issues_closed_for_0.18.md for an upcoming 0.18 release.
1 year ago
Eric Hawicz
e3db88d114
Merge pull request #871 from json-c/disallow-control-chars
Issue #867 : disallow control characters in strict mode.
1 year ago
Eric Hawicz
6bfab90c87
Issue #867 : disallow control characters in strict mode.
1 year ago
Eric Hawicz
ecb7a4c9a3
Merge pull request #864 from pavelzw/patch-1
Build pkg-config for msvc as well
1 year ago
Pavel Zwerschke
906d1581de
Update CMakeLists.txt
1 year ago
Pavel Zwerschke
9b8d170d1f
Build pkg-config for msvc as well
1 year ago
Eric Hawicz
6e481aa061
Merge pull request #861 from bhaible/handle-another-oom-condition
Handle yet another out-of-memory condition.
1 year ago
Eric Haszlakiewicz
781675758f
Although CMAKE_C_COMPILER_FRONTEND_VARIANT is defined, it's not always set to some value. Fix builds for cases when it's blank.
1 year ago
Bruno Haible
833233faa8
Handle yet another out-of-memory condition.
duplocale() can return NULL, with errno set to ENOMEM.
In this case, bail out and set the current error code to
json_tokener_error_memory.
1 year ago
Eric Hawicz
31a22fb2da
Issue #857 : fix a few places where json_tokener should have been returning json_tokener_error_memory but wasn't.
1 year ago
Eric Hawicz
0051f2dbe0
Merge pull request #858 from alurm/master
json_tokener.h: json_tokener_parse_verbose: fix typo
1 year ago
Alan Urmancheev
0741ce3918
json_tokener.h: json_tokener_parse_verbose: fix typo
1 year ago
Eric Hawicz
e3464a2ab4
Issue #829 : attempt to detect clang-cl.exe and pass MSVC-compatile command line arguments.
1 year ago
Eric Hawicz
61016412fb
Issue #850 : fill in & adjust the "@returns" docs for several functions.
1 year ago
Eric Hawicz
f2eac07129
doxygen can't handle html on heading, split that to separate lines
https://github.com/doxygen/doxygen/issues/10466
1 year ago
Eric Hawicz
e93ae70417
Fix issue #854 : Set error=json_tokener_error_memory in json_tokener_parser_verbose() when allocating the tokener fails.
1 year ago
Eric Hawicz
0bc2dd5e60
Merge pull request #852 from fedefrancescon/docs/micro-typo-fix
docs: micro typo in json_object_put doc
1 year ago
Federico Francescon
9c44c7ed52
docs: micro typo in json_object_get doc
1 year ago
Eric Hawicz
401249cbdf
Merge pull request #831 from neheb/1
rename WIN32 to _WIN32
1 year ago
Rosen Penev
66f7869219
rename WIN32 to _WIN32
The latter is the proper macro defined by Windows headers.
Fixes compilation under at least clang-cl which mandates function
declarations.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2 years ago