mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-09-07 16:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,086 Commits 16 Branches 12 Tags
9021cdcdd01fc9dbcbe1f06391848c2ac915212f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Haszlakiewicz 9021cdcdd0 Generate docs for the 0.15 release 2020-07-26 15:13:45 +00:00
Eric Haszlakiewicz 2d78acdbda Bump version to 0.15 2020-07-26 15:10:07 +00:00
Eric Hawicz 616b1050b2 Merge pull request #648 from MarcT512/rbf 
Fix "may be used uninitialized" Release build failure
 2020-07-23 22:26:58 -04:00
Eric Haszlakiewicz 730e3d044f Issue #594 - provide an OVERRIDE_GET_RANDOM_SEED cmake variable to override json_c_get_random_seed() for embedded platforms where time(NULL) doesn't work. 
Example:
mkdir build && cd build
cmake -DOVERRIDE_GET_RANDOM_SEED='do { extern uint32_t getMsTicks(void); int ms = getMsTicks() * 433494437; return ms; } while(0)' ..
 2020-07-22 02:25:03 +00:00
Eric Hawicz 64de4b6e9f Merge pull request #646 from pascal-cuoq/fix_645 
Cast to unsigned char instead of int when calling tolower (Fixes #645)
 2020-07-21 21:24:59 -04:00
Eric Haszlakiewicz 024e835f4c Update the ChangeLog with recent changes, in preparation for a 0.15 release. 2020-07-20 03:39:01 +00:00
Eric Haszlakiewicz 78a0f2ea5d Remove the obsolete config.h.win32 2020-07-17 03:47:28 +00:00
Eric Haszlakiewicz e46b9cdb7d Fix a number of things with the generated docs, including translating triple-backtick code blocks into a form doxygen understands. 2020-07-17 03:46:21 +00:00
Eric Haszlakiewicz 9a7de35b92 Add some more detail about how to use json-c in README.md. 2020-07-17 03:42:38 +00:00
Eric Haszlakiewicz cb10a13e94 Remove the THIS_FUNCTION_IS_DEPRECATED define, we stopped using it long ago. 2020-07-17 03:20:29 +00:00
Eric Haszlakiewicz 2508109b18 Remove the obsolete README.json_object-split.md, and mark README.md as being the doxygen mainpage. 2020-07-12 19:16:19 +00:00
Eric Haszlakiewicz 4d9f6dd22e Issue #642: improve the docs for json_object_put() and json_object_get(). 2020-07-12 18:43:27 +00:00
Eric Haszlakiewicz 2330c6f0de Expand the doc for json_object_array_get_idx() to explain that it does not adjust refcounts. 2020-07-12 17:55:46 +00:00
Eric Haszlakiewicz 6542d33cd1 Issue #641: Add a cast to void * to address some theoretically undefined printf behavior. 2020-07-11 15:03:00 +00:00
Eric Haszlakiewicz 10a9ac245e Issue #642: improve docs for json_tokener.h and json_object_object_add(). 2020-07-11 04:04:58 +00:00
Eric Haszlakiewicz 6fa8b7ff42 Don't export json-c symbols starting with an underscore, put deprecated exports into a "JSONC_PRIVATE" version, and note stuff to do during releases. 
See also PR #639 and issue #621
 2020-07-04 19:00:10 +00:00
Eric Haszlakiewicz 6068d3f6d1 Change the strerror_override handling to check $_JSON_C_STRERROR_OVERRIDE instead of using a variable, so we don't need to export it. 2020-07-04 18:58:00 +00:00
Eric Hawicz b01d50b8dc Merge pull request #639 from smcv/symbol-versions 
build: Add a symbol version to all exported symbols
 2020-07-04 14:26:20 -04:00
Eric Haszlakiewicz 6465e74020 Use constants referring to the signed integer types when setting SSIZE_T_MAX. 
In practice, the sizes of the signed and unsigned integer types will
almost cetainly be the same, but this is more correct.
Pointed out in issue #638.
 2020-07-01 00:34:46 +00:00
Eric Haszlakiewicz 34334e5d3f Replace one call to json_object_new_array() with json_object_new_array_ext() to ensure it at least minimally works. 2020-06-29 02:35:26 +00:00
Eric Haszlakiewicz 0b67caec1a Add doc comment for json_object_new_array_ext(). 2020-06-29 02:31:32 +00:00
Eric Haszlakiewicz a4e3700972 Fix code formatting 2020-06-29 02:31:18 +00:00
Eric Haszlakiewicz 5f3bf70f03 Make sure TEST_PARSE_CHUNKSIZE is valid if it's set. 2020-06-29 02:18:34 +00:00
Eric Haszlakiewicz f23486a321 In the json_tokener_state_number case, explicitly adjust what "number" characters are allowed based on the exact micro-state that we're in, and check for invalid following characters in a different way, to allow a valid json_type_number object to be returned at the top level. 
This causes previously failing strings like "123-456" to return a valid json_object with the appropriate value.  If you care about the trailing content, call json_tokener_parse_ex() and check the parse end point with json_tokener_get_parse_end().
 2020-06-29 02:14:26 +00:00
Eric Haszlakiewicz 6eac6986c9 Fix incremental parsing of invalid numbers with exponents, such as "0e+-" and "12.3E12E12", while still allowing "0e+" in non-strict mode. 
Deprecate the json_parse_double() function from json_util.h
 2020-06-27 15:35:04 +00:00
Eric Haszlakiewicz 84e6032883 Issue #635: Fix "expression has no effect" warning in json_tokener.c by casting to void. 2020-06-23 02:51:46 +00:00
Eric Haszlakiewicz 7a72805e34 Fix memory leak in test_parse's single_incremental_parse(). 2020-06-22 01:12:03 +00:00
Eric Haszlakiewicz 7d3c2d9fad Drop extra blank lines from arraylist.h 2020-06-21 18:30:40 +00:00
Eric Haszlakiewicz a68566bf6a Issue #616: Change the parsing of surrogate pairs in unicode escapes so it uses a couple of additional states instead of assuming the low surrogate is already present, to ensure that we correctly handle various cases of incremental parsing. 2020-06-21 18:29:57 +00:00
Eric Haszlakiewicz 197e372464 In test_parse, fix lengths passed during a couple of incremental tests. 
Add an optional way to use an incremental chunk size ($TEST_PARSE_CHUNKSIZE)
for all of the single_basic_parse tests, in additional to the regular way.
 2020-06-21 17:36:38 +00:00
Eric Haszlakiewicz 36118b681e Rearrange the json_tokener_state_escape_unicode case in json_tokener to simplify the code slightly and make it a bit easier to understand. 
While here, drop the utf8_replacement_char that is unnecesarily added if we run out of input in the middle of a unicode escape.  No other functional changes (yet).
 2020-06-21 03:10:55 +00:00
Eric Haszlakiewicz 50179fb09f Update the json_tokener_parse_ex() docs to clarify that the final '\0' character is to be included in length passed in. 2020-06-21 02:35:42 +00:00
Eric Hawicz da76ee26e7 Merge pull request #633 from dota17/issue616 
fix issue 616: support the surrogate pair in split file.
 2020-06-20 22:33:17 -04:00
Eric Haszlakiewicz e26a1195f4 Add json_object_array_shrink() (and array_list_shrink()) and use it in json_tokener to minimize the amount of memory used. This results in a 39%-50% reduction in memory use (peak RSS, peak heap usage) on the jc-bench benchmark and 9% shorter runtime. 
Also add the json_object_new_array_ext, array_list_new2, and array_list_shrink functions.
 2020-06-20 18:03:04 +00:00
Eric Hawicz 99bb2121c6 Merge pull request #632 from json-c/json_object-split 
Json object split
 2020-06-20 13:04:32 -04:00
Eric Haszlakiewicz 0710c835a1 Reformat the json_object-split branch with clang-format 2020-06-16 13:17:58 +00:00
Eric Hawicz 401b29c021 Merge pull request #634 from micahsnyder/json-c-fPIC 
Issue #508: `-fPIC` to link libjson-c.a with libs
 2020-06-14 17:56:35 -04:00
Eric Haszlakiewicz 9128ec49b1 Include unistd.h to fix the build on OSX 2020-06-14 03:11:44 +00:00
Eric Haszlakiewicz 5ebfeaedc5 Drop the _delete field from struct json_object and call the type-specific delete functions directly from json_object_put. (Thanks @dota17 for the suggestion in PR #632!) 2020-06-13 18:34:35 +00:00
Eric Haszlakiewicz 4c10712114 Drop the useless "char data[1]" from struct json_object. Fix a typo in a comment. 2020-06-13 18:25:32 +00:00
Eric Haszlakiewicz 85c244f048 Eliminate unnecessary cast that was added to test_double_serializer. 2020-06-07 18:50:10 +00:00
Eric Haszlakiewicz 02fe2e0ccd Summarize the changes from the json_object-split branch in the ChangeLog. 2020-06-07 18:45:17 +00:00
Eric Haszlakiewicz ecdfeb18cf Move the ssize_t typedef from json_inttypes.h to json_object_private.h so as not to affect publically exposed symbols. 2020-06-07 18:29:56 +00:00
Eric Haszlakiewicz 66d91fdf86 The split of json_object into type-specific sub-structures is now functionally complete. 
Remove all of the temporary defines, structures, old compat fuctions, extra fields, etc... that were needed during the conversion to a split set of json_object_* structures.
 2020-06-07 17:23:56 +00:00
Eric Haszlakiewicz c4cc673071 More fixes for old MSVC builds. 2020-06-07 15:25:59 +00:00
Eric Haszlakiewicz 0a16b23adf Fix typo in previous commit to check for SSIZE_T on MSVC. 2020-06-07 15:19:29 +00:00
Eric Haszlakiewicz eab1375123 Change CMakeLists.txt to look for SSIZE_T on MSVC too. 2020-06-07 03:36:59 +00:00
Eric Haszlakiewicz b0466b626b On MSVC, add a ssize_t typedef using SSIZE_T from BaseTsd.h 2020-06-07 03:27:13 +00:00
Eric Haszlakiewicz 0fc9d91277 Kick json_type_string out of struct json_object. 
The default is now that string data is stored inline at the end of json_object, though to allow for json_object_set_string() to set a _longer_ string, we still need to allow for the possibility of a separate char * pointer.
All json types have been split out now, next step it cleanup.
 2020-06-07 02:56:59 +00:00
Eric Hawicz bc06f82f85 Merge pull request #628 from clamwin/compat-fixes-master 
get_cryptgenrandom_seed: compat with old windows + fallback
 2020-06-03 23:53:46 -04:00
Eric Haszlakiewicz 1c6086a86a 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. 2020-05-31 03:22:14 +00:00
Eric Haszlakiewicz fe308b8862 Issue #626: Restore compatibility with cmake 2.8 by adjusting quoting and explicitly defining the PROJECT_VERSION* variables. 2020-05-30 19:37:46 +00:00
Eric Haszlakiewicz 9ecb1222bd Kick json_type_int and json_type_double out of struct json_object. 
Clean up the code in json_object_new_* a bit by dropping unnecesary json_object_base variables.
 2020-05-26 02:31:35 +00:00
Eric Haszlakiewicz 0351bb55c8 Declare variables earlier, to appease Visual Studio 2010. 2020-05-25 04:10:11 +00:00
Eric Haszlakiewicz d1f83bf5ea Kick json_type_boolean out of struct json_object. 2020-05-25 04:05:32 +00:00
Eric Haszlakiewicz 5d89fc8a9d Add some backwards compat for Visual Studio 2013. 2020-05-25 03:52:36 +00:00
Eric Haszlakiewicz 02b687b9a6 Kick json_type_array out of struct json_object; re-enable the test_deep_copy test. 2020-05-25 03:44:56 +00:00
Eric Haszlakiewicz 853b4b5dee Start splitting struct json_object into multiple sub-types, as descibed at https://github.com/json-c/json-c/wiki/Proposal:-struct-json_object-split 
The current changes split out _only_ json_type_object, and thus have a number of hacks
 to allow the code to continue to build and work.

Originally  mentioned in issue #535.
When complete, this will probably invalidate #552.
This is likely to cause notable conflicts in any other significant un-merged
changes, such as PR#620.
 2020-05-25 03:18:36 +00:00
Eric Haszlakiewicz 4a546e7b2f In arraylist, use malloc instead of calloc, avoid clearing with memeset until we really need to, and micro-optimize array_list_add(). 2020-05-24 03:54:04 +00:00
Eric Hawicz fbe1543644 Merge pull request #622 from besser82/topic/besser82/doc_subdir 
doc: Move Doxyfile into doc subdir.
 2020-05-18 15:30:21 -04:00
Eric Haszlakiewicz fa6a7dccb9 With the change in cc80203, Doxyfile no longer needs to be updated for a release. 2020-05-18 17:31:22 +00:00
Eric Hawicz cc802039a8 Merge pull request #619 from besser82/topic/besser82/doxygen_oot 
CMake: Fix out-of-tree build for Doxygen documentation.
 2020-05-18 13:30:13 -04:00
Eric Hawicz 12b2e1159d Merge pull request #618 from besser82/topic/besser82/test_deep_copy 
test_deep_copy: Fix assertion value.
 2020-05-18 13:29:21 -04:00
Eric Hawicz a8a0590921 Merge pull request #617 from besser82/topic/besser82/option_disable_tls 
Add an option to disable the use of thread-local storage.
 2020-05-18 10:25:54 -04:00
Eric Hawicz 5b15c7567d Merge pull request #614 from stoeckmann/format 
Prevent truncation on custom double formatters.
 2020-05-16 21:04:11 -04:00
Eric Hawicz 311c5e5b2b Update issue templates 2020-05-16 20:55:20 -04:00
Eric Haszlakiewicz 0a3d22b9bb Revert part of PR#606 and use isnan/isinf again, but provide macro implementations of those in math_compat.h is needed, as it seems to be on AIX and IBM i systems. 2020-05-16 01:29:18 +00:00
Eric Hawicz 1526c84a13 Merge pull request #606 from davidjmccann/master 
Improved support for IBM operating systems
 2020-05-15 21:15:18 -04:00
Eric Haszlakiewicz d414d3eabc Issue #604: add check for __MINGW32__ in snprintf_compat.h 2020-05-13 14:53:05 +00:00
Eric Haszlakiewicz 2e71fe0963 Display a bit of info about what exactly we're benchmarking. 2020-05-11 03:05:20 +00:00
Eric Haszlakiewicz 199c52e2db Ignore the bench/work and bench/data directories. 2020-05-11 03:04:10 +00:00
Eric Hawicz 3648c3ed2c Merge pull request #602 from ploxiln/parse_uint64_errno 
fix json_parse_uint64() usage of errno
 2020-05-10 21:15:47 -04:00
Eric Haszlakiewicz 26f080997d Fix snprintf on windows problem for test4. 2020-05-10 04:04:28 +00:00
Eric Haszlakiewicz 06742d6277 Issue #600: don't rename the static library on Windows, it _needs_ to have a different name because the dll build also creates a "json-c.lib" file. 2020-05-10 03:58:51 +00:00
Eric Haszlakiewicz a59d5acfab Re-format after recent change to fix linkhash. 2020-05-10 03:58:27 +00:00
Eric Haszlakiewicz 4f43a077a4 Issue #598: avoid building static libraries twice. 2020-05-10 03:48:45 +00:00
Eric Haszlakiewicz 519dfe1591 Issue #599: Fix the backwards check in lh_table_insert_w_hash() that was preventing adding more than 11 objects. 
Add a test to check for this too.
 2020-05-10 03:36:05 +00:00
Eric Hawicz 45b6416652 Merge branch 'master' of https://github.com/json-c/json-c 2020-05-08 22:25:15 -04:00
Eric Hawicz abc9a0731b Merge pull request #597 from ploxiln/json_parse_usage 
json_parse demo: fix and use usage() function
 2020-05-08 22:23:28 -04:00
Eric Hawicz 22870ac2bd Merge pull request #595 from dota17/static_shared 
Support to build both static and shared libraries
 2020-05-07 23:23:15 -04:00
Eric Hawicz 31243e4d12 Merge pull request #592 from stoeckmann/oob 
Prevent out of boundary write on malicious input
 2020-05-06 23:31:15 -04:00
Eric Haszlakiewicz 8e3d3d5544 Make the benchmark work with pre-cmake versions of json-c. Fetch a few more data files. 2020-05-04 03:40:40 +00:00
Eric Haszlakiewicz c66e7377f3 In jc-bench.sh, decode the --before and --after args. Use a separate data dir to avoid re-downloading files when the work dir is cleared. 2020-05-04 03:24:39 +00:00
Eric Haszlakiewicz 8086314026 Issue #589: drop the rdrand test loops to just 3, tweak comments and add some links to bug reports, and decrease the nesting level of the has_rdrand() function. 2020-05-04 01:33:15 +00:00
Eric Hawicz a555d0e2f2 Merge pull request #589 from Xyene/detect-broken-rdrand 
Detect broken RDRAND during initialization
 2020-05-03 21:13:48 -04:00
Eric Hawicz 9b64c3e347 Fix printf format issues in apps/json_parse, and actually call the usage() function. 2020-05-03 14:55:12 -04:00
Eric Hawicz ee90110f9b Merge pull request #590 from Xyene/fix-cpuid-segfault 
Fix segmentation fault in CPUID check
 2020-05-03 14:52:31 -04:00
Eric Haszlakiewicz f9605e9072 Fix cmake-configure to accept "--prefix=<foo>" in addition to "--prefix <foo>" (see also Issue #591) 2020-05-03 03:50:50 +00:00
Eric Haszlakiewicz 1059007024 Add an initial version of a benchmarking harness for json-c, to be able to more easily compare the performance of different library versions. 2020-04-27 04:00:00 +00:00
Eric Haszlakiewicz d9981f67dd Extend the CMakeLists.txt in the apps directory to be usable as a standalone build, to link against other versions of json-c. 
Tweak json_parse.c slightly to allow it to build against older json-c versions.
 2020-04-26 04:02:36 +00:00
Eric Haszlakiewicz 00272292a7 The json_parse command line app doesn't build on Windows, disable it. 2020-04-21 21:35:41 +00:00
Eric Haszlakiewicz 55d053118e Add an apps directory, and a json_parse program to parse an input file and report on memory usage. 
This is intended to provide a way, during development, to test out the memory
and performance impacts of a change.
 2020-04-21 03:57:56 +00:00
Eric Haszlakiewicz f6f76f9430 Add a JSON_TOKENER_ALLOW_TRAILING_CHARS flag for json_tokener_set_flags() to allow multiple objects to be parsed from input even when JSON_TOKENER_STRICT is set. 2020-04-21 03:53:44 +00:00
Eric Haszlakiewicz 05623b3a2e Add an tok_flags field to explicitly specify tokener flags in test_parse and eliminate the previous bogus calls to json_tokener_set_flags() 2020-04-21 03:53:44 +00:00
Eric Haszlakiewicz fa6bc1e2d7 Issue #471: always create directories with mode 0755, regardless of umask. 2020-04-21 03:19:17 +00:00
Eric Haszlakiewicz 8b511c402b Issue #585: don't install config.h 2020-04-21 01:13:21 +00:00
Eric Haszlakiewicz ba4527904a Add a few missing git commands to the release checklist, and change the S3 storage to "Standard", since it's actually (barely) cheaper than "Reduced Redundancy" now. 2020-04-19 04:17:29 +00:00
Eric Haszlakiewicz 2babb5b780 Update the master branch to version 0.0.14.99 2020-04-19 03:57:08 +00:00
Eric Haszlakiewicz 31ab57ca8b Fill in the ChangeLog for the upcoming 0.14 release. 2020-04-19 01:31:48 +00:00
Eric Haszlakiewicz 9ed00a694b Fill in a few more pre-release steps to match what we've done for the 0.14 release. 
Move the list of contributors to the AUTHORS file.
 2020-04-19 01:28:24 +00:00