Michael Heimpold
a7534dbb7e
Introduce json_object_from_fd
Also refactor json_object_from_file to use json_object_from_fd
internally.
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
11 years ago
Eric Haszlakiewicz
d4e81f9ec8
Move the json_min() and json_max() macros to json_util.h and mark everything else in bits.h deprecated.
Eliminate all uses of bits.h within the json-c code.
11 years ago
Eric Haszlakiewicz
1da0599e0e
Fix the definition of the error_description() macro in bits.h now that json_tokener_errors[] is not exported.
11 years ago
Eric Haszlakiewicz
2149a04ca8
Check for failures when allocating memory; return NULL and set errno=ENOMEM in a few of those cases.
Thanks to Susant Sahani for pointing out some of these.
11 years ago
Eric Haszlakiewicz
92a7740e90
Reformat some code in json_object.c
11 years ago
Eric Haszlakiewicz
795e9151a1
Add an empty README file to placate autoconf.
11 years ago
Eric Haszlakiewicz
4569e3e430
Fix minor typo in README file.
11 years ago
Eric Haszlakiewicz
40aab4c502
Merge pull request #133 from haneefmubarak/patch-1
Update and rename README to README.md
11 years ago
Eric Haszlakiewicz
332a594fd4
Merge pull request #132 from pkoretic/master
Remove unused variable 'size'
11 years ago
Haneef Mubarak
7870978c2e
Update README.md
- code blocks
- slight text changes (rewording)
- pretty printing
11 years ago
Haneef Mubarak
23620b827c
Update and rename README to README.md
Markdownify + fix a few errors here and there
11 years ago
Eric Haszlakiewicz
fa54bd542e
Update the release checklist to include calculating the tarball checksums and updating the wiki.
11 years ago
Petar Koretić
259c5c0b5f
Remove unused variable 'size'
11 years ago
Eric Haszlakiewicz
515ba0dfb7
Bump versions up to 0.12.99 since a 0.12 release was just created.
11 years ago
Eric Haszlakiewicz
f84d9c55db
Update the ChangeLog with the changes for the 0.12 release.
Bump the version in the release checklist.
11 years ago
Michael Clark
64e36901a0
Patch to address the following issues:
* CVE-2013-6371: hash collision denial of service
* CVE-2013-6370: buffer overflow if size_t is larger than int
11 years ago
Eric Haszlakiewicz
784534a31f
Eliminate the deprecated mc_abort() function and MC_ABORT macro.
11 years ago
Eric Haszlakiewicz
f9136f6852
Make the json_tokener_errors array local. It has been deprecated for a while, and json_tokener_error_desc() should be used instead.
11 years ago
Eric Haszlakiewicz
936d036ea3
Simplify the tests Makefile to avoid repeating the name of each test.
11 years ago
Eric Haszlakiewicz
e2bbb5664c
Rename the "test_case" test to "test_charcase" to make it slightly less confusing.
11 years ago
Eric Haszlakiewicz
9f26d96f09
Fix warnings from autoconf about "...no AC_LANG_SOURCE call detected..." by adding that call within the AC_LINK_IFELSE call.
11 years ago
Eric Haszlakiewicz
05da316b9c
Issue #103 : allow Infinity and -Infinity to be parsed.
11 years ago
Eric Haszlakiewicz
217bc29352
Merge pull request #123 from fingon/use-NAN-if-available
nan function requires -lm on some platforms - use of NAN is better, if available
11 years ago
Markus Stenberg
a1c8991e13
nan function requires -lm on some platforms; use of NAN is better, if available.
11 years ago
Eric Haszlakiewicz
0eedf3802f
Issue#102 - add support for parsing "NaN".
11 years ago
Eric Haszlakiewicz
e6f1322b5e
Issue#114: check for the presence of isnan and isinf, and provide compat macros on MSCV where _isnan and _finite exist instead.
11 years ago
Eric Haszlakiewicz
db117ca02b
Merge pull request #121 from TazeTSchnitzel/LowercaseLiterals
Missing lowercase literals test
11 years ago
Andrea Faulds
cf23e7506e
Merge branch 'master' into LowercaseLiterals
11 years ago
Andrea Faulds
1d6f9140ba
Missing tests
11 years ago
Eric Haszlakiewicz
4c086dfff7
Merge commit '89535bb'
11 years ago
Eric Haszlakiewicz
020fa65724
Merge pull request #112 from TazeTSchnitzel/LowercaseLiterals
Only allow lowercase literals in STRICT mode
11 years ago
Eric Haszlakiewicz
56df93d128
Fix Issue #111 : Fix off-by-one error when range checking the input to json_tokener_error_desc().
11 years ago
Eric Haszlakiewicz
ceeaf42bc8
Merge pull request #109 from kdopen/use_strtod
Avoid potential overflow in json_object_get_double
11 years ago
Eric Haszlakiewicz
b821f0e10f
Merge branch 'ebassi-master'
11 years ago
Eric Haszlakiewicz
c8e0497d47
Merge branch 'master' of https://github.com/ebassi/json-c into ebassi-master
Conflicts:
Makefile.am
11 years ago
Eric Haszlakiewicz
295bea21d0
Ignore and cleanup a few more files that automake creates.
11 years ago
Eric Haszlakiewicz
a2c078fc6e
Issue#105: Rename configure.in to configure.ac
11 years ago
Eric Haszlakiewicz
c8ee919642
Remove the old libjson.so name compatibility support. The library is only created as libjson-c.so now and headers are only installed into the ${prefix}/json-c directory.
11 years ago
Ross Burton
89535bb1ff
build: call AM_PROG_CC_C_O as requested by autoreconf
12 years ago
Andrea Faulds
bda0540cb9
Only allow lowercase literals in STRICT mode
12 years ago
Keith Derrick
c51b88d69a
Avoid potential overflow in json_object_get_double
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.
12 years ago
Emmanuele Bassi
311686f63e
Add a check for the -Bsymbolic-functions linker flag
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.
12 years ago
Eric Haszlakiewicz
06450206c4
Issue #59 : change the floating point output format to %.17g so values with more than 6 digits show up in the output.
12 years ago
Eric Haszlakiewicz
a23caf677c
Use sizeof instead of hard coded values when calling snprintf.
12 years ago
Eric Haszlakiewicz
51993c28c2
Added a json_object_new_double_s() convenience function to allow an exact 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.
12 years ago
Eric Haszlakiewicz
b83e0f1182
Ignore the test-driver script that is now created, and the script for the test_locale test.
12 years ago
Eric Haszlakiewicz
60e4990d1d
The updated test driver creates .log and .trs files; ignore them.
12 years ago
Eric Haszlakiewicz
8d18815f8a
strndup is gone, remove it from the README file.
12 years ago
Eric Haszlakiewicz
b939bd3768
Merge pull request #97 from pascal-bach/master
Add const qualifiers to json_object_to_file and json_object_to_file_ext
12 years ago
Eric Haszlakiewicz
ef43fe3571
Merge pull request #96 from rouault/remove_strdnup
Remove redefinition of strndup() which is no longer used in the codebase
12 years ago