James Myatt
72310c87a5
Define INFINITY and NAN when missing
10 years ago
James Myatt
0137103f4b
Include config.h in linkhash so that HAVE_ENDIAN_H is defined (if available)
10 years ago
James Myatt
a74f6b2867
Updated config for vs2010/winsdk71 as well as vs2013
Define JSON_C_HAVE_INTTYPES_H in json_config.h.win32 only
10 years ago
Eric Haszlakiewicz
68d856f618
Merge pull request #168 from bugness-chl/master
Tightening the number parsing algorithm
10 years ago
Eric Haszlakiewicz
7e3a6c6b9d
Merge pull request #163 from sixlettervariables/fix-win32-build-problems
Fix Win32 build problems
10 years ago
Eric Haszlakiewicz
da62fca305
Merge pull request #144 from mhei/master
Introduce json_object_from_fd
10 years ago
Eric Haszlakiewicz
484ca368f0
Slight style tweaks to the bsearch changest.
10 years ago
Eric Haszlakiewicz
a500c1f0b5
Merge pull request #155 from LeSpocky/bsearch
add bsearch for arrays
10 years ago
Eric Haszlakiewicz
9db3099572
Merge pull request #156 from jubalh/master
Remove trailing whitespaces
10 years ago
chl
99d8fc975e
Tightening the number parsing algorithm
Some badly formated "numbers" could get partly parsed,
resulting in truncated results instead of raising an
error.
Examples :
'1.2.3' -> (double)1.2
'2015-01-15' -> (int)2015
This patch is not perfect (ex: input can still end with a 'E', which
is forbidden by json.org doc) but should avoid non-sensically
formated input.
Tests added.
10 years ago
Christopher Watford
4d18d39d99
Adds json_config.h.win32 to project. Adds VS2k13 project.
10 years ago
Christopher Watford
0609a5729c
Fixes #160 'missing header file on windows'
10 years ago
Eric Haszlakiewicz
ec4879ac5b
Merge pull request #153 from LeSpocky/doc
improve doc for json_object_to_json_string()
11 years ago
Eric Haszlakiewicz
6ec6fdaf8c
Merge pull request #151 from mjchinn/json_type-comma
Remove json_type enum trailing comma
11 years ago
Eric Haszlakiewicz
2c722277ee
Merge pull request #150 from ams-cs/master
Fix build using MinGW.
11 years ago
Eric Haszlakiewicz
f88db708ac
Merge pull request #141 from AlexandruCostache/master
Removed duplicate check in random_seed test - bug #140
11 years ago
Michael Vetter
fcf5ad1bd6
Remove trailing whitespace
11 years ago
Alexander Dahl
2f5789bdef
add bsearch for arrays
Arrays can already be sorted with json_object_array_sort() which uses
qsort() of the standard C library. This adds a counterpart using the
bsearch() from C.
11 years ago
Alexander Dahl
37f5d8696d
improve doc for json_object_to_json_string()
11 years ago
Michael J. Chinn
048dcf288a
Remove json_type enum trailing comma
11 years ago
Andrew Stubbs
ca0ebe0f71
Fix build using MinGW.
MinGW requires wincrypt.h.
GCC does not support #pragma comment, which trips Werror.
11 years ago
Christopher Meng
db833f2411
SONAME bump
The last json_tokener_errors change affects the binary package, we need a bump to solve the issue.
See [this bug of postgis.](https://bugzilla.redhat.com/show_bug.cgi?id=1123785 )
11 years ago
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
Alexandru Costache
4841c48f81
Removed duplicate check in random_seed test - bug #140
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