mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-03-20 21:49:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
759 Commits 14 Branches 11 Tags
aadde421a52c1d433359bc529cf2ef06d1dce430
Commit Graph

759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Hawicz
aadde421a5 Merge pull request #625 from besser82/topic/besser82/json-c-0.13/rdrand_fixes 
json-c-0.13.x: Detect broken RDRAND during initialization.
 2023-06-28 18:01:58 -04:00
Eric Haszlakiewicz
ee9f67c81a Issue #626: Restore compatibility with cmake 2.8 by explicitly defining the PROJECT_VERSION* variables. 
(cherry picked from commit fe308b8862)
 2020-06-03 03:09:11 +00:00
Björn Esser
a731ae6a75 Detect broken RDRAND during initialization. 
Some CPUs advertise RDRAND in CPUID, but return
0xFFFFFFFF unconditionally.  To avoid locking up
later, test RDRAND during initialization, and if
it returns 0xFFFFFFFF, mark it as nonexistent.

Also fix a possible segmentation fault in CPUID check.

This commit is a squashed and slightly modified backport
of the following commits on the master branch:

  * 0e5bbcaa16
  * 4d36b0287d
  * 8086314026
 2020-06-01 16:45:45 +02:00
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)
 2020-05-31 03:38:01 +00:00
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 ...
 2020-05-14 11:23:40 -04:00
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
 2020-05-14 12:32:30 +02:00
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>
 2018-12-11 20:35:56 -05:00
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>
 2018-06-07 13:19:27 -04:00
Eric Haszlakiewicz
4bbc72f633 Merge pull request #420 from angelskieglazki/master 
arraylist: Fixed names of parameters for callback function
 2018-06-02 23:01:04 -04:00
max
7a4759f165 arraylist: Fix names of parameters for callback function 2018-06-01 18:21:06 +03:00
Eric Haszlakiewicz
4414d068b3 Always create debug info (pdb file) even for release builds. 2018-05-27 21:50:57 -04:00
Eric Haszlakiewicz
7038bb8061 Try the appveyor changes again, using %Configuration% instead of "Debug" 2018-05-27 18:20:32 -04:00
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. 2018-05-27 16:07:11 -04:00
Eric Haszlakiewicz
c75ebe8973 Merge pull request #410 from janczer/fix-typos 
Fixed typos
 2018-04-24 22:01:09 -04:00
janczer
8bd62177e7 Fixed typos 2018-04-24 16:00:38 +02:00
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. 2018-03-25 18:25:58 -04:00
Eric Haszlakiewicz
da4b34355d Add an parse test for content starting with a UTF8 BOM, which is _not_ a valid start to a JSON message. 2018-03-25 18:23:42 -04:00
Eric Haszlakiewicz
985c46fec3 Update docs for the 0.13.1 release. json-c-0.13.1-20180305 2018-03-05 23:18:59 -05:00
Eric Haszlakiewicz
991e128df5 Bump version to 0.13.1, and re-generate autoconf and automake files. 2018-03-05 23:16:43 -05:00
Eric Haszlakiewicz
914527d091 Eliminate ACLOCAL_AMFLAGS, since it changes how libtool files are generated too significantly. 2018-03-05 23:14:57 -05:00
Eric Haszlakiewicz
861c1a8286 Update the change log for the 0.13.1 release. 
Conflicts:
	ChangeLog
 2018-03-05 22:56:03 -05:00
Eric Haszlakiewicz
104aef0a6e Update the change log for the 0.13.1 release. 2018-03-05 22:54:57 -05:00
Eric Haszlakiewicz
0f814e52dd Issue #396: check for toolchain compatibilty with _REENTRANT before adding it to CFLAGS. 2018-03-04 22:46:05 -05:00
Chris Wolfe
33e166a685 pull in fuzzers, add CI scripts later 
Conflicts:
	ChangeLog
 2018-03-04 22:44:57 -05:00
Jonathan Wiens
d222b13758 Avoid uninitialized variable warnings 
Fix json_object_object_foreach to avoid uninitialized variable warnings
using ANSI C or MSC.
 2018-03-04 22:37:53 -05:00
Eric Haszlakiewicz
2fd95844c3 Issue #396: check for toolchain compatibilty with _REENTRANT before adding it to CFLAGS. 2018-03-04 22:32:45 -05:00
Eric Haszlakiewicz
1e301d94be Merge pull request #402 from derwolfe/fuzz 
Add fuzzers from OSS-Fuzz
 2018-02-19 13:54:18 -05:00
Chris Wolfe
1e08150838 pull in fuzzers, add CI scripts later 2018-02-05 19:26:24 -06:00
Eric Haszlakiewicz
f8eb1dec64 Merge pull request #399 from jonathan-wiens/bugfix/initialize_variable 
Avoid uninitialized variable warnings
 2018-01-26 23:46:33 -05:00
Jonathan Wiens
cdc4e9f64b Avoid uninitialized variable warnings 
Fix json_object_object_foreach to avoid uninitialized variable warnings
using ANSI C or MSC.
 2018-01-17 15:57:52 +01:00
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. 2018-01-15 23:34:05 -05:00
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. 2018-01-15 23:31:55 -05:00
Eric Haszlakiewicz
a70466ebbf PR#394: fix breakage with VS build. 2017-12-25 15:17:52 -05:00
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).
 2017-12-25 15:17:52 -05:00
Eric Haszlakiewicz
c652b6ad29 PR#394: fix breakage with VS build. 2017-12-24 14:42:58 -05:00
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).
 2017-12-24 13:45:52 -05:00
Eric Haszlakiewicz
0992aac61f Remove the TRUE and FALSE defines. 2017-12-23 09:42:17 -05:00
Eric Haszlakiewicz
cfd09c87f0 Merge pull request #393 from besser82/enhancement/unsigned_refcount 
json_object_private: Use unsigned 32-bit integer type for refcount
 2017-12-17 09:52:27 -05:00
Björn Esser
c233f5c05e json_object_private: Use unsigned 32-bit integer type for refcount 2017-12-17 12:51:17 +01:00
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
 2017-12-14 17:25:53 -05:00
Björn Esser
3e89278476 Makefile: Add ACLOCAL_AMFLAGS 
This is recommended by the libtool manual.
 2017-12-14 15:48:31 +01:00
Björn Esser
99ea93338d json_object: Avoid invalid free (and thus a segfault) when ref_count gets < 0 2017-12-14 15:45:22 +01:00
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
 2017-12-14 09:28:06 -05:00
Björn Esser
9aca3b6a08 json_object: Avoid invalid free (and thus a segfault) when ref_count gets < 0 2017-12-14 14:36:07 +01:00
Rikard Falkeborn
b5a3eff582 Fix non-GNUC define for JSON_C_CONST_FUNCTION 2017-12-13 22:04:28 -05:00
Eric Haszlakiewicz
1882e3c425 Merge pull request #390 from besser82/json-c-0.13 
json_object: Add const size_t json_c_object_sizeof()
 2017-12-13 22:03:51 -05:00
Eric Haszlakiewicz
8c214902d9 Merge pull request #386 from besser82/bugfix/aclocal_amflags 
Makefile: Add ACLOCAL_AMFLAGS
 2017-12-13 22:03:20 -05:00
Eric Haszlakiewicz
e411b1a36e Merge pull request #391 from rikardfalkeborn/fix-const-function-define 
Fix non-GNUC define for JSON_C_CONST_FUNCTION
 2017-12-13 21:51:13 -05:00
Rikard Falkeborn
84dcc01da1 Fix non-GNUC define for JSON_C_CONST_FUNCTION 2017-12-13 22:29:16 +01:00
Eric Haszlakiewicz
8baf437817 Apply gcc's "const" attribute to the json_c_object_sizeof() function as an optimizer hint. Also, rename that function from json_object_sizeof(). 2017-12-13 21:17:39 +01:00