| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | On MSVC, add a ssize_t typedef using SSIZE_T from BaseTsd.h | Eric Haszlakiewicz | 2020-06-07 | 1 | -0/+5 | |
| | | | | ||||||
| | * | | Kick json_type_string out of struct json_object. | Eric Haszlakiewicz | 2020-06-07 | 5 | -109/+162 | |
| | | | | | | | | | | | | | | | | 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. | |||||
| | * | | Kick json_type_int and json_type_double out of struct json_object. | Eric Haszlakiewicz | 2020-05-26 | 3 | -147/+172 | |
| | | | | | | | | | | | | | Clean up the code in json_object_new_* a bit by dropping unnecesary json_object_base variables. | |||||
| | * | | Declare variables earlier, to appease Visual Studio 2010. | Eric Haszlakiewicz | 2020-05-25 | 1 | -3/+6 | |
| | | | | ||||||
| | * | | Kick json_type_boolean out of struct json_object. | Eric Haszlakiewicz | 2020-05-25 | 2 | -16/+36 | |
| | | | | ||||||
| | * | | Add some backwards compat for Visual Studio 2013. | Eric Haszlakiewicz | 2020-05-25 | 1 | -0/+5 | |
| | | | | ||||||
| | * | | Kick json_type_array out of struct json_object; re-enable the test_deep_copy ↵ | Eric Haszlakiewicz | 2020-05-25 | 3 | -31/+82 | |
| | | | | | | | | | | | | | test. | |||||
| | * | | Start splitting struct json_object into multiple sub-types, as descibed at ↵ | Eric Haszlakiewicz | 2020-05-25 | 5 | -52/+406 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| * | | | Merge pull request #634 from micahsnyder/json-c-fPIC | Eric Hawicz | 2020-06-14 | 2 | -0/+9 | |
| |\ \ \ | | | | | | | | | Issue #508: `-fPIC` to link libjson-c.a with libs | |||||
| | * | | | Issue #508: `-fPIC` to link libjson-c.a with libs | Micah Snyder | 2020-06-14 | 2 | -0/+9 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | json-c has symbol collisions with other popular C JSON libraries. To prevent random crashes in downstream applications that may use a library which depends on json-c, the solution is to statically link libjson-c.a into those libraries. `-fPIC`/`-fPIE` is required when building a `.a` so it can be linked into a `.so`. | |||||
| * | | | Merge pull request #628 from clamwin/compat-fixes-master | Eric Hawicz | 2020-06-03 | 1 | -10/+18 | |
| |\ \ \ | |_|/ |/| | | get_cryptgenrandom_seed: compat with old windows + fallback | |||||
| | * | | get_cryptgenrandom_seed: compat with old windows + fallback | Gianluigi Tiesi | 2020-06-03 | 1 | -10/+18 | |
| |/ / | ||||||
| * | | Apply the fix from @pointbre in issue #626 to skip "inline" on AIX, but ↵ | Eric Haszlakiewicz | 2020-05-31 | 1 | -3/+3 | |
| | | | | | | | | | invert the test to make it a little easier to understand. | |||||
| * | | Issue #626: Restore compatibility with cmake 2.8 by adjusting quoting and ↵ | Eric Haszlakiewicz | 2020-05-30 | 1 | -8/+16 | |
| |/ | | | | explicitly defining the PROJECT_VERSION* variables. | |||||
| * | In arraylist, use malloc instead of calloc, avoid clearing with memeset ↵ | Eric Haszlakiewicz | 2020-05-24 | 1 | -4/+25 | |
| | | | | | until we really need to, and micro-optimize array_list_add(). | |||||
| * | Merge pull request #622 from besser82/topic/besser82/doc_subdir | Eric Hawicz | 2020-05-18 | 4 | -22/+21 | |
| |\ | | | | | doc: Move Doxyfile into doc subdir. | |||||
| | * | CMake: Fix grammar: written -> wrote. | Björn Esser | 2020-05-18 | 1 | -2/+2 | |
| | | | ||||||
| | * | doc: Move Doxyfile into doc subdir | Björn Esser | 2020-05-18 | 4 | -20/+19 | |
| |/ | ||||||
| * | With the change in cc80203, Doxyfile no longer needs to be updated for a ↵ | Eric Haszlakiewicz | 2020-05-18 | 1 | -2/+0 | |
| | | | | | release. | |||||
| * | Merge pull request #619 from besser82/topic/besser82/doxygen_oot | Eric Hawicz | 2020-05-18 | 2 | -6/+7 | |
| |\ | | | | | CMake: Fix out-of-tree build for Doxygen documentation. | |||||
| | * | CMake: Fix out-of-tree build for Doxygen documentation. | Björn Esser | 2020-05-18 | 2 | -6/+7 | |
| | | | ||||||
| * | | Merge pull request #618 from besser82/topic/besser82/test_deep_copy | Eric Hawicz | 2020-05-18 | 1 | -1/+1 | |
| |\ \ | |/ |/| | test_deep_copy: Fix assertion value. | |||||
| | * | test_deep_copy: Fix assertion value. | Björn Esser | 2020-05-18 | 1 | -1/+1 | |
| |/ | ||||||
| * | Merge pull request #617 from besser82/topic/besser82/option_disable_tls | Eric Hawicz | 2020-05-18 | 3 | -21/+26 | |
| |\ | | | | | Add an option to disable the use of thread-local storage. | |||||
| | * | README: Update configuration options for CMake. | Björn Esser | 2020-05-18 | 1 | -10/+11 | |
| | | | ||||||
| | * | CMake: Re-format config-option block and re-order it alphabetically. | Björn Esser | 2020-05-18 | 1 | -5/+5 | |
| | | | ||||||
| | * | CMake: Add an option to disable the use of thread-local storage. | Björn Esser | 2020-05-18 | 1 | -7/+10 | |
| | | | | | | | | | | | | | | | | | Using thread-local storage may not be desired in all environments and/or use-cases, thus there should be an option to disable its use on purpose. Fixes #451. | |||||
| | * | tests: Fix test_double_serializer without thread-local storage. | Björn Esser | 2020-05-18 | 1 | -0/+1 | |
| |/ | ||||||
| * | Merge pull request #614 from stoeckmann/format | Eric Hawicz | 2020-05-16 | 3 | -2/+17 | |
| |\ | | | | | Prevent truncation on custom double formatters. | |||||
| | * | Prevent truncation on custom double formatters. | Tobias Stoeckmann | 2020-05-16 | 3 | -2/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A custom double formatter can lead to truncation of the rest of the JSON document. If a custom formatter completely fills the buffer used by snprintf with a trailing dot or comma and the formatting option JSON_C_TO_STRING_NOZERO has been specified, then an iterator moves past the ending '\0' (off-by-one buffer overflow) to set an additional '\0' and adds the first '\0' into the printbuf. Since '\0' will eventually be considered the terminating character of the complete printbuf result, all trailing characters are lost. This leads to an incomplete JSON string as can be seen with the test case. The off-by-one can be noticed if compiled with address sanitizer. Since this is a very special case and a malformed formatter could do way more harm and is the responsibility of the user of this library, this is just a protective measure to keep json-c code as robust as possible. | |||||
| * | | Update issue templates | Eric Hawicz | 2020-05-16 | 1 | -0/+23 | |
| |/ | ||||||
| * | Revert part of PR#606 and use isnan/isinf again, but provide macro ↵ | Eric Haszlakiewicz | 2020-05-16 | 2 | -6/+8 | |
| | | | | | implementations of those in math_compat.h is needed, as it seems to be on AIX and IBM i systems. | |||||
| * | Merge pull request #606 from davidjmccann/master | Eric Hawicz | 2020-05-15 | 8 | -11/+39 | |
| |\ | | | | | Improved support for IBM operating systems | |||||
| | * | Improved support for IBM operating systems | David McCann | 2020-05-14 | 8 | -11/+39 | |
| | | | | | | | | | Fix compiler errors and warnings when building on IBM operating systems such as AIX and IBM i. | |||||
| * | | Issue #604: add check for __MINGW32__ in snprintf_compat.h | Eric Haszlakiewicz | 2020-05-13 | 1 | -1/+1 | |
| | | | ||||||
| * | | Display a bit of info about what exactly we're benchmarking. | Eric Haszlakiewicz | 2020-05-11 | 1 | -0/+11 | |
| | | | ||||||
| * | | Ignore the bench/work and bench/data directories. | Eric Haszlakiewicz | 2020-05-11 | 1 | -0/+4 | |
| |/ | ||||||
| * | Merge pull request #602 from ploxiln/parse_uint64_errno | Eric Hawicz | 2020-05-10 | 3 | -9/+8 | |
| |\ | | | | | fix json_parse_uint64() usage of errno | |||||
| | * | fix json_parse_uint64() usage of errno | Pierce Lopez | 2020-05-10 | 3 | -9/+8 | |
| |/ | | | | | introduced in #542 fixes #601 | |||||
| * | Fix snprintf on windows problem for test4. | Eric Haszlakiewicz | 2020-05-10 | 1 | -0/+1 | |
| | | ||||||
| * | Issue #600: don't rename the static library on Windows, it _needs_ to have a ↵ | Eric Haszlakiewicz | 2020-05-10 | 1 | -0/+2 | |
| | | | | | different name because the dll build also creates a "json-c.lib" file. | |||||
| * | Re-format after recent change to fix linkhash. | Eric Haszlakiewicz | 2020-05-10 | 2 | -3/+3 | |
| | | ||||||
| * | Issue #598: avoid building static libraries twice. | Eric Haszlakiewicz | 2020-05-10 | 1 | -1/+1 | |
| | | ||||||
| * | Issue #599: Fix the backwards check in lh_table_insert_w_hash() that was ↵ | Eric Haszlakiewicz | 2020-05-10 | 3 | -1/+31 | |
| | | | | | | | preventing adding more than 11 objects. Add a test to check for this too. | |||||
| * | Merge branch 'master' of https://github.com/json-c/json-c | Eric Hawicz | 2020-05-08 | 9 | -38/+173 | |
| |\ | ||||||
| | * | Merge pull request #597 from ploxiln/json_parse_usage | Eric Hawicz | 2020-05-08 | 1 | -7/+6 | |
| | |\ | | | | | | | json_parse demo: fix and use usage() function | |||||
| | | * | json_parse demo: fix and use usage() function | Pierce Lopez | 2020-05-08 | 1 | -7/+6 | |
| | |/ | ||||||
| | * | Merge pull request #595 from dota17/static_shared | Eric Hawicz | 2020-05-07 | 3 | -5/+23 | |
| | |\ | | | | | | | Support to build both static and shared libraries | |||||
| | | * | cmake-configure: fix enable-static option | hofnarr | 2020-05-08 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | cmake: change variable name | hofnarr | 2020-05-08 | 1 | -3/+3 | |
| | | | | ||||||
 |
index : delta/json-c.git | |
| github.com: json-c/json-c.git |
| summaryrefslogtreecommitdiff |