Commit Graph

  • 4bbb53a25d Make valgrind happy Petri Lehtinen 2014-02-12 08:54:06 +02:00
  • 569295fe30 Fix feature checks to use correct __ATOMIC flags Petri Lehtinen 2014-02-12 08:44:29 +02:00
  • 3f5acaa3fb Merge branch '2.6' Petri Lehtinen 2014-02-11 15:15:00 +02:00
  • 42016a35c8 Oops, ATOMIC_ACQ_REL is not a correct memmodel for __atomic_store_n Petri Lehtinen 2014-02-11 15:14:31 +02:00
  • 17ec22f514 Merge branch '2.6' Petri Lehtinen 2014-02-11 14:49:15 +02:00
  • e83ded066a jansson 2.6 Petri Lehtinen 2014-02-11 09:43:07 +02:00
  • 492feb26ce Document json_object_seed() Petri Lehtinen 2014-02-11 09:24:42 +02:00
  • 8f80c2d838 CVE-2013-6401: Change hash function, randomize hashes Petri Lehtinen 2014-01-14 11:16:39 +02:00
  • b9c588de3d expect "export" in test configs Chip Salzenberg 2013-09-27 17:21:46 -07:00
  • a721d36f41 Merge pull request #161 from JoakimSoderberg/cmake_travis Petri Lehtinen 2014-01-28 06:02:17 -08:00
  • eee85cd53c Merge pull request #160 from JoakimSoderberg/cmake_memcheck_fix Petri Lehtinen 2014-01-28 06:01:03 -08:00
  • 7c80778827 Fix so that valgrind checks actually works with CMake. Joakim Soderberg 2014-01-28 13:07:59 +00:00
  • 4c2cc0e36c Add CMake build to Travis config. Joakim Soderberg 2014-01-28 11:53:48 +01:00
  • a630e226ba Merge pull request #159 from JoakimSoderberg/config_fix Petri Lehtinen 2014-01-28 01:11:57 -08:00
  • 0c95a22888 Make sure the private config is included. Joakim Soderberg 2014-01-28 09:59:43 +01:00
  • 30fdf6067e Update copyrights for 2014 Petri Lehtinen 2014-01-28 09:16:05 +02:00
  • cffc5df600 Merge pull request #157 from JoakimSoderberg/cmake_config_new Petri Lehtinen 2014-01-27 23:10:55 -08:00
  • 3fe8f74e7f Renamed config.h -> jansson_private_config.h Joakim Soderberg 2014-01-13 17:13:44 +01:00
  • 913937c98d Added CMake config files. Joakim Soderberg 2014-01-10 16:50:33 +01:00
  • b21cd65d30 Fix CMake build flags for MinGW Petri Lehtinen 2014-01-16 08:01:35 +02:00
  • c89638d73c Merge pull request #151 from nmlgc/master Petri Lehtinen 2013-12-28 02:56:35 -08:00
  • 98610bfcec Check for key == NULL in json_object_get and json_object_del nmlgc 2013-12-28 05:58:09 +01:00
  • 9c8b3c833f Merge branch '2.5' Petri Lehtinen 2013-12-27 08:55:52 +02:00
  • dc69aa797b github_commits.c: GitHub API v3 requires a User-Agent header origin/2.5 Petri Lehtinen 2013-12-27 08:55:05 +02:00
  • 4e8c4bfbd2 Merge branch '2.5' Petri Lehtinen 2013-12-13 09:27:42 +02:00
  • 316492e4d0 Merge Petri Lehtinen 2013-12-13 09:26:58 +02:00
  • 3347679d8f Merge branch '2.5' Petri Lehtinen 2013-12-13 09:22:50 +02:00
  • b951baec0d Include CMake specific files in release tarballs Petri Lehtinen 2013-12-13 09:22:33 +02:00
  • 05f7d30e5a Add json_boolean_value as alias for json_is_true Petri Lehtinen 2013-12-04 09:14:17 +02:00
  • 34d8b92dce Merge branch '2.5' Petri Lehtinen 2013-11-14 08:49:24 +02:00
  • 67a7bc7376 doc: Set all memory to zero in secure_free Petri Lehtinen 2013-11-14 08:49:16 +02:00
  • 30a4c88843 Fix an off-by-one error Petri Lehtinen 2013-10-15 08:49:40 +03:00
  • 08be94e8e6 Don't call strlen twice Petri Lehtinen 2013-10-15 08:46:16 +03:00
  • d544852ff6 Avoid integer overflows with very long strings Petri Lehtinen 2013-10-15 08:44:04 +03:00
  • 8dc3233f3b Merge pull request #143 from chipdude/master Petri Lehtinen 2013-10-03 22:36:34 -07:00
  • c7d479c740 in simple string tests, always check lengths too Chip Salzenberg 2013-10-03 19:07:50 -07:00
  • a76dc45512 paper bag bug: json_string_set* functions should set the length too Chip Salzenberg 2013-10-03 19:07:20 -07:00
  • 9bb5a266dd Merge pull request #142 from chipdude/master Petri Lehtinen 2013-09-30 22:41:25 -07:00
  • 6ebd0bc7a6 fix type mismatch anywhere int != int32 (Vorne) Chip Salzenberg 2013-09-30 16:56:01 -07:00
  • f8d8d524cf Document JSON_ALLOW_NUL and clarify NUL byte handling Petri Lehtinen 2013-09-30 10:52:49 +03:00
  • 1bfc33362e Add JSON_ALLOW_NUL decoding flag for enabling NUL byte support Petri Lehtinen 2013-09-30 10:44:35 +03:00
  • 5744468c99 Clarify json_string_length doc Petri Lehtinen 2013-09-30 09:37:18 +03:00
  • 4d5aead31c Fix NUL byte check for object keys Petri Lehtinen 2013-09-30 09:35:45 +03:00
  • 78a80b8899 load.c: Change an error message Petri Lehtinen 2013-09-30 09:24:36 +03:00
  • b961e8101e Add Chip's changes to release notes Petri Lehtinen 2013-09-30 08:56:39 +03:00
  • 7876125a22 Document s% and s# for json_pack, s% for json_unpack Petri Lehtinen 2013-09-30 08:46:35 +03:00
  • e2dcf94598 Merge pull request #141 from chipdude/nuls Petri Lehtinen 2013-09-29 22:31:15 -07:00
  • 6c1ce27095 add new public functions to jansson.def Chip Salzenberg 2013-09-29 16:57:23 -07:00
  • 46e27ae6d5 Merge pull request #140 from chipdude/nuls Petri Lehtinen 2013-09-29 11:57:57 -07:00
  • 0be5c959da document new null-friendly functions Chip Salzenberg 2013-09-27 19:10:32 -07:00
  • face43929d expect "export" in test configs Chip Salzenberg 2013-09-27 17:21:46 -07:00
  • dcaa90d21e dump \u sequences as upper case for readability (just like error messages) Chip Salzenberg 2013-09-26 22:25:48 -07:00
  • 9c259c07aa Support \u0000 - add size_t string lengths to API, load and dump \u000, etc. Also: Steal strings during parsing for half the mallocs! Change all input-caused assertions to errors. No crashes please, we're programmers. Chip Salzenberg 2012-04-03 18:00:29 -07:00
  • e4d6a9f6f4 Add versionadded to the new json_pack() format specifiers Petri Lehtinen 2013-09-23 09:34:00 +03:00
  • 641002da37 jansson 2.5 v2.5 Petri Lehtinen 2013-09-19 21:17:26 +03:00
  • 9f9c9fe410 doc: Fix index type for json_array_foreach() Petri Lehtinen 2013-09-19 21:26:41 +03:00
  • e39112b29c Merge branch '2.4' Petri Lehtinen 2013-09-19 20:47:33 +03:00
  • bf2584703a Mention success first in json_load_callback_t docs origin/2.4 Petri Lehtinen 2013-09-16 08:48:54 +03:00
  • db8ca3645f Clarified json_load_callback_t return value docs Phillip Howell 2013-09-13 16:35:39 -05:00
  • 0490907fb3 Merge branch '2.4' Petri Lehtinen 2013-09-19 20:46:07 +03:00
  • c2e8fdde9d Mention success first in json_load_callback_t docs Petri Lehtinen 2013-09-16 08:48:54 +03:00
  • 24c67966aa Mention success first in json_load_callback_t docs Petri Lehtinen 2013-09-16 08:48:54 +03:00
  • 0747d3943f Clarified json_load_callback_t return value docs Phillip Howell 2013-09-13 16:35:39 -05:00
  • 5f9ef108d0 Merge pull request #134 from lano1106/master Petri Lehtinen 2013-08-27 22:37:44 -07:00
  • 21599b95f8 Replace strcpy with memcpy Olivier Langlois 2013-08-27 22:47:18 -04:00
  • 3196ad48ed pack: Add format specifiers s#, + and +# Petri Lehtinen 2013-08-14 21:54:11 +03:00
  • 49ad5328c7 doc: Add an example for circumventing problems with Windows heaps Petri Lehtinen 2013-08-06 08:11:53 +03:00
  • 71676acd0b Fix memory leaks and warnings in github_commits.c Petri Lehtinen 2013-07-27 21:23:34 +03:00
  • 2489ea90b1 Update copyrights for 2013 Petri Lehtinen 2013-07-23 13:20:06 +03:00
  • 11d45b0090 Fix integer overflow in jsonp_strdup() Petri Lehtinen 2013-07-21 13:00:25 +03:00
  • 8490e377c0 Make the argument of json_deep_copy() const Petri Lehtinen 2013-06-17 08:40:43 +03:00
  • ef666519f7 Merge pull request #128 from JoakimSoderberg/lex_unget_unsave_fix Petri Lehtinen 2013-07-01 21:41:55 -07:00
  • 6fe231757e BUGFIX: Compilation error with -DNDEBUG defined. Joakim Soderberg 2013-06-26 09:50:46 +00:00
  • 84b5bfe173 Merge pull request #127 from cryptobiote/master Petri Lehtinen 2013-06-25 11:30:39 -07:00
  • d9ee5a7f1b Update CMakeLists.txt cryptobiote 2013-06-25 09:36:11 -06:00
  • 19a19d1952 Adding option for MSVC for those who are linking statically. cryptobiote 2013-06-20 11:00:40 -06:00
  • 68e201add8 Merge pull request #125 from jjwchoy/master Petri Lehtinen 2013-06-13 22:59:22 -07:00
  • 62531bd012 Prevent unused-variable warning Jason Choy 2013-06-13 11:37:07 +01:00
  • f639fbd2c3 Tweak the JSON_DECODE_INT_AS_REAL test introduced in #123 Petri Lehtinen 2013-06-12 08:36:51 +03:00
  • a38704df58 Fix indentation in docs Petri Lehtinen 2013-06-12 08:30:28 +03:00
  • 8d439710cd Merge pull request #123 from jjwchoy/decode-ignore-int Petri Lehtinen 2013-06-11 22:23:40 -07:00
  • 120a90a155 Using jsonp_strtod instead of casting to double to catch double overflow Jason Choy 2013-06-11 15:09:08 +01:00
  • c3e9725f02 Changed :versionadded for JSON_DECODE_INT_AS_REAL docs Jason Choy 2013-06-11 12:31:41 +01:00
  • 02a3829363 Renamed flag to JSON_DECODE_INT_AS_REAL and added documentation Jason Choy 2013-06-11 11:53:35 +01:00
  • 018f7fea31 Merge pull request #120 from paulharris/mine_pre_2.5 Petri Lehtinen 2013-06-09 22:18:05 -07:00
  • e6bd0aba9d Added a simple test for the JSON_DECODE_NO_INT option Jason Choy 2013-06-09 15:34:30 +01:00
  • 9e7f11a847 Implemented a decode option to only decode numbers to reals and never integers Jason Choy 2013-06-09 15:14:47 +01:00
  • 042d4b2a6b Merge pull request #121 from jjwchoy/master Petri Lehtinen 2013-06-07 05:17:46 -07:00
  • ddd10b5e0b Added missing rv check - caught by clang Jason Choy 2013-06-07 13:08:22 +01:00
  • 2fd66fab1a Adjust CMakeLists.txt and .def: add _d postfix onto jansson_d.lib/dll Paul Harris 2013-06-02 17:20:25 +08:00
  • 5cc594c9e8 Don't shadow the stdlib function index() with arg names Petri Lehtinen 2013-05-21 08:53:12 +03:00
  • ffb7ef4b75 Merge pull request #118 from dtgriscom/master Petri Lehtinen 2013-05-12 22:16:09 -07:00
  • b49280be72 Fixed "comparison between signed and unsigned" warning Daniel Griscom 2013-05-12 15:45:00 -04:00
  • 7121134abd Removed (non-functioning) printfs from test code Daniel Griscom 2013-05-12 15:36:09 -04:00
  • e8c812b500 Added test cases and documentation for json_array_foreach() Daniel Griscom 2013-05-12 15:34:26 -04:00
  • 6950cd203b Add json_array_foreach() #define, parallelling json_object_foreach() Daniel Griscom 2013-05-12 15:03:26 -04:00
  • d3bd463897 Merge pull request #115 from JoakimSoderberg/cmake_pkgconfig Petri Lehtinen 2013-05-06 22:38:28 -07:00
  • 54d86fb4a4 Create and install the pkg-config file jansson.pc for CMake. Joakim Soderberg 2013-05-06 12:34:52 +00:00
  • 42d398243d Fix the cmake Sphinx find script. Joakim Soderberg 2013-05-06 12:31:29 +00:00
  • f675514815 jansson:doc: modified incref doc Andrei Epure 2013-04-27 13:25:01 +03:00