summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-03-03Merge pull request #168 from bugness-chl/masterHEADmasterEric Haszlakiewicz3-2/+62
Tightening the number parsing algorithm
2015-03-03Merge pull request #163 from sixlettervariables/fix-win32-build-problemsEric Haszlakiewicz6-31/+322
Fix Win32 build problems
2015-03-03Merge pull request #144 from mhei/masterEric Haszlakiewicz2-11/+27
Introduce json_object_from_fd
2015-03-04Slight style tweaks to the bsearch changest.Eric Haszlakiewicz4-14/+12
2015-03-03Merge pull request #155 from LeSpocky/bsearchEric Haszlakiewicz4-2/+49
add bsearch for arrays
2015-03-03Merge pull request #156 from jubalh/masterEric Haszlakiewicz10-37/+37
Remove trailing whitespaces
2015-02-05Tightening the number parsing algorithmchl3-2/+62
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.
2014-12-05Adds json_config.h.win32 to project. Adds VS2k13 project.Christopher Watford3-2/+205
2014-12-05Fixes #160 'missing header file on windows'Christopher Watford3-29/+117
2014-09-13Merge pull request #153 from LeSpocky/docEric Haszlakiewicz1-0/+5
improve doc for json_object_to_json_string()
2014-09-13Merge pull request #151 from mjchinn/json_type-commaEric Haszlakiewicz1-3/+3
Remove json_type enum trailing comma
2014-09-13Merge pull request #150 from ams-cs/masterEric Haszlakiewicz1-0/+3
Fix build using MinGW.
2014-09-13Merge pull request #141 from AlexandruCostache/masterEric Haszlakiewicz1-5/+2
Removed duplicate check in random_seed test - bug #140
2014-08-26Remove trailing whitespaceMichael Vetter10-37/+37
2014-08-21add bsearch for arraysAlexander Dahl4-2/+49
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.
2014-08-18improve doc for json_object_to_json_string()Alexander Dahl1-0/+5
2014-08-10Remove json_type enum trailing commaMichael J. Chinn1-3/+3
2014-08-04Fix build using MinGW.Andrew Stubbs1-0/+3
MinGW requires wincrypt.h. GCC does not support #pragma comment, which trips Werror.
2014-07-21Introduce json_object_from_fdMichael Heimpold2-11/+27
Also refactor json_object_from_file to use json_object_from_fd internally. Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2014-07-04Removed duplicate check in random_seed test - bug #140Alexandru Costache1-5/+2
2014-05-04Move the json_min() and json_max() macros to json_util.h and mark everything ↵Eric Haszlakiewicz7-17/+34
else in bits.h deprecated. Eliminate all uses of bits.h within the json-c code.
2014-05-03Fix the definition of the error_description() macro in bits.h now that ↵Eric Haszlakiewicz1-1/+1
json_tokener_errors[] is not exported.
2014-04-19Check for failures when allocating memory; return NULL and set errno=ENOMEM ↵Eric Haszlakiewicz1-1/+26
in a few of those cases. Thanks to Susant Sahani for pointing out some of these.
2014-04-19Reformat some code in json_object.cEric Haszlakiewicz1-198/+231
2014-04-19Add an empty README file to placate autoconf.Eric Haszlakiewicz1-0/+0
2014-04-19Fix minor typo in README file.Eric Haszlakiewicz1-1/+1
2014-04-19Merge pull request #133 from haneefmubarak/patch-1Eric Haszlakiewicz2-45/+63
Update and rename README to README.md
2014-04-19Merge pull request #132 from pkoretic/masterEric Haszlakiewicz1-2/+0
Remove unused variable 'size'
2014-04-12Update README.mdHaneef Mubarak1-13/+14
- code blocks - slight text changes (rewording) - pretty printing
2014-04-12Update and rename README to README.mdHaneef Mubarak2-45/+62
Markdownify + fix a few errors here and there
2014-04-11Update the release checklist to include calculating the tarball checksums ↵Eric Haszlakiewicz1-0/+15
and updating the wiki.
2014-04-11Remove unused variable 'size'Petar Koretić1-2/+0
2014-04-10Bump versions up to 0.12.99 since a 0.12 release was just created.Eric Haszlakiewicz5-6/+10
2014-04-10Update the ChangeLog with the changes for the 0.12 release.b2g-0.12Eric Haszlakiewicz2-2/+34
Bump the version in the release checklist.
2014-04-09Patch to address the following issues:Michael Clark11-13/+691
* CVE-2013-6371: hash collision denial of service * CVE-2013-6370: buffer overflow if size_t is larger than int
2014-03-22Eliminate the deprecated mc_abort() function and MC_ABORT macro.Eric Haszlakiewicz2-23/+0
2014-03-22Make the json_tokener_errors array local. It has been deprecated for a ↵Eric Haszlakiewicz2-10/+1
while, and json_tokener_error_desc() should be used instead.
2014-03-22Simplify the tests Makefile to avoid repeating the name of each test.Eric Haszlakiewicz2-18/+20
2014-03-22Rename the "test_case" test to "test_charcase" to make it slightly less ↵Eric Haszlakiewicz5-27/+5
confusing.
2014-03-22Fix warnings from autoconf about "...no AC_LANG_SOURCE call detected..." by ↵Eric Haszlakiewicz1-2/+2
adding that call within the AC_LINK_IFELSE call.
2014-03-22Issue #103: allow Infinity and -Infinity to be parsed.Eric Haszlakiewicz7-2/+97
2014-03-22Merge pull request #123 from fingon/use-NAN-if-availableEric Haszlakiewicz1-1/+6
nan function requires -lm on some platforms - use of NAN is better, if available
2014-03-18nan function requires -lm on some platforms; use of NAN is better, if available.Markus Stenberg1-1/+6
2014-03-09Issue#102 - add support for parsing "NaN".Eric Haszlakiewicz6-10/+44
2014-03-02Issue#114: check for the presence of isnan and isinf, and provide compat ↵Eric Haszlakiewicz4-1/+42
macros on MSCV where _isnan and _finite exist instead.
2014-02-12Merge pull request #121 from TazeTSchnitzel/LowercaseLiteralsEric Haszlakiewicz3-0/+53
Missing lowercase literals test
2014-02-12Merge branch 'master' into LowercaseLiteralsAndrea Faulds3-0/+53
2014-02-12Missing testsAndrea Faulds3-0/+53
2014-02-11Merge commit '89535bb'Eric Haszlakiewicz1-0/+1
2014-02-11Merge pull request #112 from TazeTSchnitzel/LowercaseLiteralsEric Haszlakiewicz2-33/+50
Only allow lowercase literals in STRICT mode
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-03 16:48:31 +0000