aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Expand)AuthorFilesLines
2014-02-11Merge branch '2.6'Petri Lehtinen9-62/+699
2014-02-11jansson 2.6Petri Lehtinen2-3/+4
2014-02-11CVE-2013-6401: Change hash function, randomize hashesPetri Lehtinen9-58/+695
2014-01-28Update copyrights for 2014Petri Lehtinen14-14/+14
2014-01-27Renamed config.h -> jansson_private_config.hJoakim Soderberg2-3/+4
2013-12-28Check for key == NULL in json_object_get and json_object_delnmlgc1-2/+2
2013-12-04Add json_boolean_value as alias for json_is_truePetri Lehtinen1-0/+1
2013-10-15Fix an off-by-one errorPetri Lehtinen1-1/+1
2013-10-15Don't call strlen twicePetri Lehtinen1-1/+1
2013-10-15Avoid integer overflows with very long stringsPetri Lehtinen2-1/+8
2013-10-03paper bag bug: json_string_set* functions should set the length tooChip Salzenberg1-0/+1
2013-09-30fix type mismatch anywhere int != int32 (Vorne)Chip Salzenberg1-1/+1
2013-09-30Add JSON_ALLOW_NUL decoding flag for enabling NUL byte supportPetri Lehtinen2-1/+12
2013-09-30Fix NUL byte check for object keysPetri Lehtinen1-1/+1
2013-09-30load.c: Change an error messagePetri Lehtinen1-1/+1
2013-09-29add new public functions to jansson.defChip Salzenberg1-0/+5
2013-09-27dump \u sequences as upper case for readability (just like error messages)Chip Salzenberg1-2/+2
2013-09-27Support \u0000 - add size_t string lengths to API, load and dump \u000, etc.Chip Salzenberg9-111/+241
2013-09-19jansson 2.5v2.5Petri Lehtinen2-4/+4
2013-08-27Replace strcpy with memcpyOlivier Langlois1-1/+1
2013-08-14pack: Add format specifiers s#, + and +#Petri Lehtinen4-56/+176
2013-07-23Update copyrights for 2013Petri Lehtinen14-14/+14
2013-07-21Fix integer overflow in jsonp_strdup()Petri Lehtinen1-1/+6
2013-07-08Make the argument of json_deep_copy() constPetri Lehtinen2-12/+20
2013-06-26BUGFIX: Compilation error with -DNDEBUG defined.Joakim Soderberg1-1/+10
2013-06-11Merge pull request #123 from jjwchoy/decode-ignore-intPetri Lehtinen2-4/+14
2013-06-11Using jsonp_strtod instead of casting to double to catch double overflowJason Choy1-1/+6
2013-06-11Renamed flag to JSON_DECODE_INT_AS_REAL and added documentationJason Choy2-5/+5
2013-06-09Implemented a decode option to only decode numbers to reals and never integersJason Choy2-1/+6
2013-06-02Adjust CMakeLists.txt and .def: add _d postfix onto jansson_d.lib/dllPaul Harris1-2/+0
2013-05-21Don't shadow the stdlib function index() with arg namesPetri Lehtinen1-4/+4
2013-05-12Add json_array_foreach() #define, parallelling json_object_foreach()Daniel Griscom1-0/+5
2013-04-15Merge branch '2.4'Petri Lehtinen1-0/+3
2013-04-15json_dump*(): Don't crash if json is NULL and JSON_ENCODE_ANY is setPetri Lehtinen1-0/+3
2013-04-02Merge pull request #108 from Zillode/1edff47af38a2335f88300ee6dc437118f5a20ffPetri Lehtinen4-0/+11
2013-03-14Do not define _GNU_SOURCE is already definedLode Hoste4-0/+11
2013-03-07Moved *config.h.cmake to the cmake directory.Joakim Soderberg1-62/+0
2013-03-07Consolidated the CMake project.Joakim Soderberg1-23/+0
2013-03-07Add CMake build system.Paul Harris5-0/+94
2013-02-04Merge branch '2.4'Petri Lehtinen1-5/+0
2013-02-04Enable gcc specific flags in tests correctlyPetri Lehtinen1-5/+0
2013-01-03Merge branch '2.4'Petri Lehtinen1-1/+1
2013-01-03Make it possible to forward declare struct json_tPetri Lehtinen1-1/+1
2012-12-28Merge branch '2.4'Petri Lehtinen1-1/+1
2012-12-28Fix // -> /* */Petri Lehtinen1-1/+1
2012-12-10Merge branch '2.4'Petri Lehtinen4-5/+5
2012-12-10Change const pointer to arrayJacob Potter1-1/+1
2012-12-10Mark some constant data as const.Jacob Potter3-4/+4
2012-12-10fixed l_isxdigit() macroAttie Grande1-1/+1
2012-12-04Merge branch '2.4'Petri Lehtinen1-1/+1