pointbre
a8899be02a
Merge branch 'json-c-0.13' into json-c-0.13
5 years ago
Eric Haszlakiewicz
cc5c4345c3
Apply the fix from @pointbre in issue #626 to skip "inline" on AIX, but invert the test to make it a little easier to understand.
(cherry picked from commit 1c6086a86a
)
5 years ago
Lucas Kim
4153f5a913
Fixed version issue for cmake 2.8
5 years ago
Lucas Kim
89b278a240
Fixed version issue for cmake 2.8
5 years ago
pointbre
ce73fdbdf1
Changed version configurations just for cmake < 3
5 years ago
pointbre
11b9a97b34
Update linkhash.h to fix bug
5 years ago
pointbre
fbee2e5297
Update CMakeLists.txt
5 years ago
pointbre
a11d947c6a
Build issue on AIX 6.1 and cc V11.1
5 years ago
pointbre
fb67cea0a1
Fixes for cmake 2.8.12
5 years ago
Eric Hawicz
86ac554d27
Merge pull request #607 from besser82/topic/besser82/json-c-0.13/CVE-2020-12762
json-c-0.13.x: Fix CVE-2020-12762 - json-c through 0.14 has an integer overflow and out-of-bounds write ...
5 years ago
Björn Esser
865b5a6519
Fix CVE-2020-12762.
This commit is a squashed backport of the following commits
on the master branch:
* 099016b7e8
* 77d935b7ae
* d07b910149
* 519dfe1591
* a59d5acfab
5 years ago
Eric Haszlakiewicz
0daf8dc826
install json_object_iterator.h header file
When building the project using cmake then installing it. The
definitions in `json_object_iterator.h` are required but not installed
by the cmake install rule. This patch adds the `json_object_iterator.h`
file to the list of files to install.
Signed-off-by: Keith Holman <keith.holman@windriver.com>
6 years ago
Keith Holman
37a2edf468
install json_object_iterator.h header file
When building the project using cmake then installing it. The
definitions in `json_object_iterator.h` are required but not installed
by the cmake install rule. This patch adds the `json_object_iterator.h`
file to the list of files to install.
Signed-off-by: Keith Holman <keith.holman@windriver.com>
7 years ago
Eric Haszlakiewicz
4bbc72f633
Merge pull request #420 from angelskieglazki/master
arraylist: Fixed names of parameters for callback function
7 years ago
max
7a4759f165
arraylist: Fix names of parameters for callback function
7 years ago
Eric Haszlakiewicz
4414d068b3
Always create debug info (pdb file) even for release builds.
7 years ago
Eric Haszlakiewicz
7038bb8061
Try the appveyor changes again, using %Configuration% instead of "Debug"
7 years ago
Eric Haszlakiewicz
dfc0fddf22
Include the json-c.lib, .pdb and .exp files in the zip file created by the appveyor build, since it seems they're needed for linking and debugging.
7 years ago
Eric Haszlakiewicz
c75ebe8973
Merge pull request #410 from janczer/fix-typos
Fixed typos
7 years ago
janczer
8bd62177e7
Fixed typos
7 years ago
Eric Haszlakiewicz
f8c632f579
Issue #407 : fix incorrect casts in calls to ctype functions (isdigit and isspace) so we don't crash when asserts are enabled on certain platforms and characters > 128 are parsed.
7 years ago
Eric Haszlakiewicz
da4b34355d
Add an parse test for content starting with a UTF8 BOM, which is _not_ a valid start to a JSON message.
7 years ago
Eric Haszlakiewicz
985c46fec3
Update docs for the 0.13.1 release.
7 years ago
Eric Haszlakiewicz
991e128df5
Bump version to 0.13.1, and re-generate autoconf and automake files.
7 years ago
Eric Haszlakiewicz
914527d091
Eliminate ACLOCAL_AMFLAGS, since it changes how libtool files are generated too significantly.
7 years ago
Eric Haszlakiewicz
861c1a8286
Update the change log for the 0.13.1 release.
Conflicts:
ChangeLog
7 years ago
Eric Haszlakiewicz
104aef0a6e
Update the change log for the 0.13.1 release.
7 years ago
Eric Haszlakiewicz
0f814e52dd
Issue #396 : check for toolchain compatibilty with _REENTRANT before adding it to CFLAGS.
7 years ago
Chris Wolfe
33e166a685
pull in fuzzers, add CI scripts later
Conflicts:
ChangeLog
7 years ago
Jonathan Wiens
d222b13758
Avoid uninitialized variable warnings
Fix json_object_object_foreach to avoid uninitialized variable warnings
using ANSI C or MSC.
7 years ago
Eric Haszlakiewicz
2fd95844c3
Issue #396 : check for toolchain compatibilty with _REENTRANT before adding it to CFLAGS.
7 years ago
Eric Haszlakiewicz
1e301d94be
Merge pull request #402 from derwolfe/fuzz
Add fuzzers from OSS-Fuzz
7 years ago
Chris Wolfe
1e08150838
pull in fuzzers, add CI scripts later
7 years ago
Eric Haszlakiewicz
f8eb1dec64
Merge pull request #399 from jonathan-wiens/bugfix/initialize_variable
Avoid uninitialized variable warnings
7 years ago
Jonathan Wiens
cdc4e9f64b
Avoid uninitialized variable warnings
Fix json_object_object_foreach to avoid uninitialized variable warnings
using ANSI C or MSC.
7 years ago
Eric Haszlakiewicz
4d814600d7
Bump the major version of the .so library generated up to 4.0 to avoid conflicts because some downstream packagers of json-c had already done their own bump to ".so.3" for a much older 0.12 release.
7 years ago
Eric Haszlakiewicz
250de31f17
Bump the major version of the .so library generated up to 4.0 to avoid conflicts because some downstream packagers of json-c had already done their own bump to ".so.3" for a much older 0.12 release.
7 years ago
Eric Haszlakiewicz
a70466ebbf
PR#394: fix breakage with VS build.
7 years ago
Eric Haszlakiewicz
8270e83552
PR#394: don't always append the ".0" if the double value rounds to zero because some custom formats *will* include it (e.g. %.2f).
Also try to accomodate formats to explicitly exclude the decimal (e.g. %.0f).
7 years ago
Eric Haszlakiewicz
c652b6ad29
PR#394: fix breakage with VS build.
7 years ago
Eric Haszlakiewicz
d5da847f51
PR#394: don't always append the ".0" if the double value rounds to zero because some custom formats *will* include it (e.g. %.2f).
Also try to accomodate formats to explicitly exclude the decimal (e.g. %.0f).
7 years ago
Eric Haszlakiewicz
0992aac61f
Remove the TRUE and FALSE defines.
7 years ago
Eric Haszlakiewicz
cfd09c87f0
Merge pull request #393 from besser82/enhancement/unsigned_refcount
json_object_private: Use unsigned 32-bit integer type for refcount
7 years ago
Björn Esser
c233f5c05e
json_object_private: Use unsigned 32-bit integer type for refcount
7 years ago
Eric Haszlakiewicz
eb55c83600
Merge pull request #392 from besser82/json-c-0.13
json_object: Avoid invalid free (and thus a segfault) when ref_count gets < 0
7 years ago
Björn Esser
3e89278476
Makefile: Add ACLOCAL_AMFLAGS
This is recommended by the libtool manual.
7 years ago
Björn Esser
99ea93338d
json_object: Avoid invalid free (and thus a segfault) when ref_count gets < 0
7 years ago
Eric Haszlakiewicz
5ea6a05bfa
Merge pull request #389 from besser82/bugfix/invalid_free
json_object: Avoid double free (and thus a segfault) when ref_count gets < 0
7 years ago
Björn Esser
9aca3b6a08
json_object: Avoid invalid free (and thus a segfault) when ref_count gets < 0
7 years ago
Rikard Falkeborn
b5a3eff582
Fix non-GNUC define for JSON_C_CONST_FUNCTION
7 years ago