summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Disable -Werrorbaserock/json-c-0.12-20140410-plus-patchSam Thursfield2017-07-043-3/+3
| | | | | | | | | | | Even after patching in the /* fall through */ comments GCC 7 still fails with stuff like this: linkhash.c:334:15: error: this statement may fall through [-Werror=implicit-fallthrough=] case 9 : c+=k8[8]; /* fall through */ ~^~~~~~~ Life is too short to build with -Werror.
* Add FALLTHRU comment to handle GCC7 warnings.marxin2017-07-043-11/+13
|
* Remove unused variable 'size'Petar Koretić2015-01-271-2/+0
|
* Add doxygen-generated docs for the 0.12 release.json-c-0.12-20140410Eric Haszlakiewicz2014-04-1085-0/+12140
|
* Bump the version numbers for the 0.12 release.Eric Haszlakiewicz2014-04-104-6/+6
|
* Add automake/autoconf generated files for the 0.12 release.Eric Haszlakiewicz2014-04-1013-0/+41555
|
* Update the ChangeLog with the changes for the 0.12 release.Eric Haszlakiewicz2014-04-102-2/+34
| | | | Bump the version in the release checklist.
* Patch to address the following issues:Michael Clark2014-04-0911-13/+691
| | | | | * CVE-2013-6371: hash collision denial of service * CVE-2013-6370: buffer overflow if size_t is larger than int
* Eliminate the deprecated mc_abort() function and MC_ABORT macro.Eric Haszlakiewicz2014-03-222-23/+0
|
* Make the json_tokener_errors array local. It has been deprecated for a ↵Eric Haszlakiewicz2014-03-222-10/+1
| | | | while, and json_tokener_error_desc() should be used instead.
* Simplify the tests Makefile to avoid repeating the name of each test.Eric Haszlakiewicz2014-03-222-18/+20
|
* Rename the "test_case" test to "test_charcase" to make it slightly less ↵Eric Haszlakiewicz2014-03-225-27/+5
| | | | confusing.
* Fix warnings from autoconf about "...no AC_LANG_SOURCE call detected..." by ↵Eric Haszlakiewicz2014-03-221-2/+2
| | | | adding that call within the AC_LINK_IFELSE call.
* Issue #103: allow Infinity and -Infinity to be parsed.Eric Haszlakiewicz2014-03-227-2/+97
|
* Merge pull request #123 from fingon/use-NAN-if-availableEric Haszlakiewicz2014-03-221-1/+6
|\ | | | | nan function requires -lm on some platforms - use of NAN is better, if available
| * nan function requires -lm on some platforms; use of NAN is better, if available.Markus Stenberg2014-03-181-1/+6
|/
* Issue#102 - add support for parsing "NaN".Eric Haszlakiewicz2014-03-096-10/+44
|
* Issue#114: check for the presence of isnan and isinf, and provide compat ↵Eric Haszlakiewicz2014-03-024-1/+42
| | | | macros on MSCV where _isnan and _finite exist instead.
* Merge pull request #121 from TazeTSchnitzel/LowercaseLiteralsEric Haszlakiewicz2014-02-123-0/+53
|\ | | | | Missing lowercase literals test
| * Merge branch 'master' into LowercaseLiteralsAndrea Faulds2014-02-123-0/+53
| |\
| | * Missing testsAndrea Faulds2014-02-123-0/+53
| | |
* | | Merge commit '89535bb'Eric Haszlakiewicz2014-02-111-0/+1
|\ \ \
| * | | build: call AM_PROG_CC_C_O as requested by autoreconfRoss Burton2013-11-181-0/+1
| | |/ | |/|
* | | Merge pull request #112 from TazeTSchnitzel/LowercaseLiteralsEric Haszlakiewicz2014-02-112-33/+50
|\ \ \ | | |/ | |/| Only allow lowercase literals in STRICT mode
| * | Only allow lowercase literals in STRICT modeAndrea Faulds2013-11-142-33/+50
| |/
* | Fix Issue #111: Fix off-by-one error when range checking the input to ↵Eric Haszlakiewicz2014-02-111-1/+1
| | | | | | | | json_tokener_error_desc().
* | Merge pull request #109 from kdopen/use_strtodEric Haszlakiewicz2014-02-111-1/+32
|\ \ | | | | | | Avoid potential overflow in json_object_get_double
| * | Avoid potential overflow in json_object_get_doubleKeith Derrick2013-10-011-1/+32
| |/ | | | | | | | | | | | | | | | | sscanf is always a potential problem when converting numeric values as it does not correctly handle over- and underflow (or at least gives no indication that it has done so). This change converts json_object_get_double() to use strtod() according to CERT guidelines.
* | Merge branch 'ebassi-master'Eric Haszlakiewicz2014-02-112-1/+27
|\ \
| * \ Merge branch 'master' of https://github.com/ebassi/json-c into ebassi-masterEric Haszlakiewicz2014-02-112-1/+27
| |\ \ | | | | | | | | | | | | | | | | Conflicts: Makefile.am
| | * | Add a check for the -Bsymbolic-functions linker flagEmmanuele Bassi2013-09-172-2/+28
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The -Bsymbolic-functions linker flag reduces the amount of PLT jumps in a shared object, and has a side effect of preventing symbol collisions in libraries and applications linking against two different shared objects exposing the same symbol. While the former is (generally) a performance win, the latter is less rare than expected. For instance, PulseAudio started linking against json-c a while ago; now, every project linking against PulseAudio is leaking json-c symbols. In the GNOME platform, this means that projects linking against PulseAudio cannot be safely linked against other libraries depending on the GLib-based JSON parsing libraries JSON-GLib, because of a symbol conflict. Nominally, this conflict would not be an issue: libraries and applications do not need to depend on two different JSON parsing libraries; the symbol leakage, though, ends up causing either segmentation faults, or weird errors. For further reference, please see: https://bugzilla.gnome.org/show_bug.cgi?id=703734 JSON-GLib already switched to using -Bsymbolic-functions, but it would be safe if json-c did the same, wherever the linker flag is available.
* | | Ignore and cleanup a few more files that automake creates.Eric Haszlakiewicz2014-02-113-1/+3
|/ /
* | Issue#105: Rename configure.in to configure.acEric Haszlakiewicz2014-02-111-0/+0
| |
* | Remove the old libjson.so name compatibility support. The library is only ↵Eric Haszlakiewicz2014-02-113-48/+1
|/ | | | created as libjson-c.so now and headers are only installed into the ${prefix}/json-c directory.
* Issue #59: change the floating point output format to %.17g so values with ↵Eric Haszlakiewicz2013-09-111-1/+1
| | | | more than 6 digits show up in the output.
* Use sizeof instead of hard coded values when calling snprintf.Eric Haszlakiewicz2013-09-111-4/+4
|
* Added a json_object_new_double_s() convenience function to allow an exact ↵Eric Haszlakiewicz2013-09-116-11/+83
| | | | | | string representation of a double to be specified when creating the object and use it in json_tokener_parse_ex() so a re-serialized object more exactly matches the input. Add json_object_free_userdata() and json_object_userdata_to_json_string() too.
* Ignore the test-driver script that is now created, and the script for the ↵Eric Haszlakiewicz2013-09-081-0/+2
| | | | test_locale test.
* The updated test driver creates .log and .trs files; ignore them.Eric Haszlakiewicz2013-09-081-0/+2
|
* strndup is gone, remove it from the README file.Eric Haszlakiewicz2013-09-081-1/+1
|
* Merge pull request #97 from pascal-bach/masterEric Haszlakiewicz2013-09-082-4/+4
|\ | | | | Add const qualifiers to json_object_to_file and json_object_to_file_ext
| * Update json_utilPascal Bach2013-08-132-4/+4
| | | | | | | | | | filename should be passed as const char* to functions json_object_to_file and json_object_to_file
* | Merge pull request #96 from rouault/remove_strdnupEric Haszlakiewicz2013-09-084-31/+1
|\ \ | | | | | | Remove redefinition of strndup() which is no longer used in the codebase
| * | Remove redefinition of strndup() which is no longer used in the codebaseEven Rouault2013-08-124-31/+1
| |/
* | Merge pull request #95 from rouault/extern_json_object_set_serializerEric Haszlakiewicz2013-09-081-1/+1
|\ \ | | | | | | Add extern to json_object_set_serializer so that it gets exported (Windows fix)
| * | Add extern to json_object_set_serializer so that it gets exported (Windows fix)Even Rouault2013-08-111-1/+1
| |/
* | Merge pull request #94 from remicollet/issue-strict2Eric Haszlakiewicz2013-09-081-2/+14
|\ \ | | | | | | more strictness
| * | trailing char not allowed in strict modeRemi Collet2013-08-231-0/+7
| | |
| * | no comment in strict modeRemi Collet2013-08-211-1/+1
| | |
| * | no single-quote string in strict modeRemi Collet2013-08-061-1/+6
| |/
View Lorry Controller Status