Commit Graph

  • 77a4276a8c Fix various potential null ptr deref and int32 overflows Even Rouault 2016-01-11 12:15:54 +01:00
  • 7150b7f28d Use a macro to indicate C99 to the compiler Sevan Janiyan 2016-01-05 11:43:17 +00:00
  • 79c99aeb2b configure: check realloc with AC_CHECK_FUNCS() to fix cross-compilation. Jehan 2016-01-01 18:35:14 +01:00
  • 537f8bcbdb Add const qualifiers to several functions that don't modify the json_object. Eric Haszlakiewicz 2015-12-26 21:42:18 +00:00
  • 882b7d95cc Issue #137: remove config.h.in from change control. Eric Haszlakiewicz 2015-12-08 21:20:42 -06:00
  • 980cdd61be Merge commit '2be921d88376e78f84d79aafa6db2714da804e59' Eric Haszlakiewicz 2015-12-08 20:51:06 -06:00
  • 65be8275da Merge pull request #209 from rgerhards/fix-regression Eric Haszlakiewicz 2015-11-29 21:24:50 -05:00
  • 316da85818 Fix issue #201: add a JSON_C_TO_STRING_NOSLASHESCAPE flag to turn off escaping of forward slashes. Eric Haszlakiewicz 2015-11-28 20:00:30 -06:00
  • 5a6a378725 Merge pull request #198 from unmole/master Eric Haszlakiewicz 2015-11-28 13:58:07 -05:00
  • 7e98ed93f4 subtract first, then retrieve value Emiel Bruijntjes 2015-11-28 14:19:43 +01:00
  • 9d85367679 added tabs instead of spaces to be compatible with rest of code Emiel Bruijntjes 2015-11-27 16:53:57 +01:00
  • 827f0fd8ef update indentation Emiel Bruijntjes 2015-11-27 16:52:17 +01:00
  • 23ee243113 reference increment and decrement is now atomic (when using a GCC compatible compiler), which allows passing json objects between threads Emiel Bruijntjes 2015-11-27 16:49:32 +01:00
  • 92e9a5032b Use size_t for json object array ops Daniel M. Weeks 2014-08-22 12:16:45 -04:00
  • 45c56b80c4 Use size_t for array list length and size Daniel M. Weeks 2014-08-22 10:56:59 -04:00
  • 36610fb697 fix regression from 2d549662be Rainer Gerhards 2015-11-19 11:05:15 +01:00
  • c97bbd3797 Merge pull request #199 from Nzbuu/fix_vs_build Eric Haszlakiewicz 2015-11-14 23:31:15 -05:00
  • b82a51a5cd Merge pull request #200 from Nzbuu/ci_build Eric Haszlakiewicz 2015-11-14 23:30:38 -05:00
  • 239c146a4b Appveyor: Visual Studio v140 no longer fails James Myatt 2015-11-05 13:50:30 +00:00
  • fd43c2b99a Appveyor: Create artefact with library and include files only James Myatt 2015-11-05 13:41:42 +00:00
  • 80c1f69b9e Use AX_APPEND_COMPILE_FLAGS() to check the various compile flags, such as -Wall, to ensure the compile supports. Eric Haszlakiewicz 2015-10-23 02:16:40 +00:00
  • 10d50aadf2 Remove the AC_FUNC_MALLOC check, since we don't depend on the malloc(0) behavior it checks for, and we don't provide a rpl_malloc() implementation anyway. Eric Haszlakiewicz 2015-10-22 02:57:13 +00:00
  • 82030cd0af Travis: add osx and clang builds James Myatt 2015-10-09 23:50:51 +01:00
  • 88dedb8824 Travis: skip install step James Myatt 2015-10-09 23:48:06 +01:00
  • f786feac0a Add Travis build script James Myatt 2015-10-09 23:46:19 +01:00
  • 17e11e2c92 Appveyor: Allow failing builds against newest toolset James Myatt 2015-09-11 13:03:36 +01:00
  • f6f8436e97 Add initial version of Appveyor build script James Myatt 2015-09-11 12:20:44 +01:00
  • 3f012eb0f8 Fix build in Visual Studio James Myatt 2015-10-09 23:24:55 +01:00
  • 467102fa78 Remove superfluous NULL checks Anmol Sarma 2015-10-01 14:14:03 +05:30
  • f37b0a10a5 Fix possible memory leak Anmol Sarma 2015-10-01 14:09:09 +05:30
  • 12916e229c Merge pull request #196 from rgerhards/improve-performance Eric Haszlakiewicz 2015-09-28 22:25:29 -04:00
  • c4f8cc34df more efficient handling for smalls strings inside json_object Rainer Gerhards 2015-09-23 15:56:48 +02:00
  • 1ae4b50bde remove unneeded data items from hashtable code Rainer Gerhards 2015-09-23 12:40:57 +02:00
  • 8f8d03df46 add perllike hash function for strings Rainer Gerhards 2015-09-23 11:12:13 +02:00
  • 2d549662be add json_object_object_add_ex() API Rainer Gerhards 2015-09-23 09:08:49 +02:00
  • d8e44dc685 reduce duplicate hash computation in json_object_object_add() Rainer Gerhards 2015-09-22 19:07:30 +02:00
  • 1757a31750 Fix doc for json_object_new_boolean() to indicate the correct value for TRUE (1). Eric Haszlakiewicz 2015-08-23 00:08:14 -04:00
  • d4f8f92eb0 Squash deprecated function warning by replacing json_object_object_get calls with json_object_object_get_ex in test_cast. Eric Haszlakiewicz 2015-08-23 00:06:36 -04:00
  • 93b1fe63e5 Add back in the __attribute__((__unused__)) that was lost in the previous commit. It's needed to squash a "variable 'val' set but not used" warning. Eric Haszlakiewicz 2015-08-22 23:59:49 -04:00
  • a8bbefbbb4 Merge pull request #183 from cryogen/master Eric Haszlakiewicz 2015-08-22 15:24:26 -04:00
  • 55530bfc0f Merge pull request #186 from Virtual-Instruments/master Eric Haszlakiewicz 2015-08-05 23:19:19 -04:00
  • e8a302017f Syntax error Jacob Alexander 2015-06-02 13:59:50 -07:00
  • b594c34f57 Merge pull request #174 from haata/master Eric Haszlakiewicz 2015-05-31 12:10:13 -07:00
  • 92d4cf15f0 Adding JSON_C_TO_STRING_PRETTY_TAB flag Jacob Alexander 2015-03-23 16:34:30 -07:00
  • cd8bd7f617 Tell the compiler we're intentionally ignoring the return value from __sync_val_compare_and_swap(). Eric Haszlakiewicz 2015-05-26 19:02:19 -07:00
  • 75d7409c4e Fix uninitialised variable compile warning, and also fix unused-when-used warning Stuart Walsh 2015-03-31 12:23:03 +01:00
  • cbedf2f7ca Merge pull request #149 from cicku/patch-2 Eric Haszlakiewicz 2015-05-09 21:35:22 -04:00
  • e4fce5d6ae Merge pull request #171 from Nzbuu/vs2010_build Eric Haszlakiewicz 2015-05-08 21:31:37 -04:00
  • 8ba19375d5 Merge pull request #177 from cryogen/json-c-0.12 Eric Haszlakiewicz 2015-05-08 21:20:54 -04:00
  • e1eb298de1 Merge pull request #182 from tpetazzoni/libm-fix Eric Haszlakiewicz 2015-05-08 21:19:48 -04:00
  • 82a1316f76 Merge pull request #180 from yegorich/silent Eric Haszlakiewicz 2015-05-08 21:19:05 -04:00
  • 93582ad85e Link against libm when needed Thomas Petazzoni 2015-05-01 12:52:18 +02:00
  • 36b0169ed6 Enable silent build by default Yegor Yefremov 2015-04-25 21:57:38 +02:00
  • cdca9d3c8e Added array_list_del_idx and json_object_array_del_idx Mark Swoope 2015-04-02 14:05:27 -07:00
  • 89ae583a86 Fix uninitialised variable compile warning, and also fix unused-when-used warning Stuart Walsh 2015-03-31 12:23:03 +01:00
  • 736f4b3581 Build random_seed.c as well James Myatt 2015-02-05 16:38:47 +00:00
  • 9d3d8d6fc0 Add x64 build configurations James Myatt 2015-02-05 16:15:06 +00:00
  • e1a3f33a26 Set CompileAsCpp flag (Required for vs2010/winsdk71) Revert some project settings to defaults James Myatt 2015-02-05 16:12:28 +00:00
  • d5baa0381f Update VS project to include current source files James Myatt 2015-02-05 16:02:58 +00:00
  • 18b3c49296 Use more appropriate casts James Myatt 2015-02-05 15:59:19 +00:00
  • bf32650c83 Add missing include file to random_seed James Myatt 2015-02-05 15:58:39 +00:00
  • 720d566d03 Define macros from inttypes.h when not available James Myatt 2015-02-05 15:58:12 +00:00
  • 9be71700eb json_tokener requires INF and NAN James Myatt 2015-02-05 15:57:14 +00:00
  • 72310c87a5 Define INFINITY and NAN when missing James Myatt 2015-02-05 15:56:49 +00:00
  • 0137103f4b Include config.h in linkhash so that HAVE_ENDIAN_H is defined (if available) James Myatt 2015-02-05 15:55:25 +00:00
  • a74f6b2867 Updated config for vs2010/winsdk71 as well as vs2013 Define JSON_C_HAVE_INTTYPES_H in json_config.h.win32 only James Myatt 2015-02-05 15:54:19 +00:00
  • 68d856f618 Merge pull request #168 from bugness-chl/master Eric Haszlakiewicz 2015-03-03 22:41:31 -05:00
  • 7e3a6c6b9d Merge pull request #163 from sixlettervariables/fix-win32-build-problems Eric Haszlakiewicz 2015-03-03 22:35:36 -05:00
  • da62fca305 Merge pull request #144 from mhei/master Eric Haszlakiewicz 2015-03-03 22:12:49 -05:00
  • 484ca368f0 Slight style tweaks to the bsearch changest. Eric Haszlakiewicz 2015-03-04 03:10:10 +00:00
  • a500c1f0b5 Merge pull request #155 from LeSpocky/bsearch Eric Haszlakiewicz 2015-03-03 22:00:08 -05:00
  • 9db3099572 Merge pull request #156 from jubalh/master Eric Haszlakiewicz 2015-03-03 21:37:02 -05:00
  • 99d8fc975e Tightening the number parsing algorithm chl 2015-02-05 01:34:10 +01:00
  • 4d18d39d99 Adds json_config.h.win32 to project. Adds VS2k13 project. Christopher Watford 2014-12-05 10:27:44 -05:00
  • 0609a5729c Fixes #160 'missing header file on windows' Christopher Watford 2014-12-05 10:22:36 -05:00
  • ec4879ac5b Merge pull request #153 from LeSpocky/doc Eric Haszlakiewicz 2014-09-13 22:18:51 -04:00
  • 6ec6fdaf8c Merge pull request #151 from mjchinn/json_type-comma Eric Haszlakiewicz 2014-09-13 22:18:14 -04:00
  • 2c722277ee Merge pull request #150 from ams-cs/master Eric Haszlakiewicz 2014-09-13 22:17:57 -04:00
  • f88db708ac Merge pull request #141 from AlexandruCostache/master Eric Haszlakiewicz 2014-09-13 22:14:44 -04:00
  • fcf5ad1bd6 Remove trailing whitespace Michael Vetter 2014-08-26 14:48:59 +02:00
  • 2f5789bdef add bsearch for arrays Alexander Dahl 2014-08-21 15:42:50 +02:00
  • 37f5d8696d improve doc for json_object_to_json_string() Alexander Dahl 2014-08-18 10:28:38 +02:00
  • 048dcf288a Remove json_type enum trailing comma Michael J. Chinn 2014-08-10 00:46:25 -04:00
  • ca0ebe0f71 Fix build using MinGW. Andrew Stubbs 2014-08-04 11:44:25 +01:00
  • db833f2411 SONAME bump Christopher Meng 2014-07-28 19:28:19 +08:00
  • a7534dbb7e Introduce json_object_from_fd Michael Heimpold 2014-07-21 23:15:45 +02:00
  • 4841c48f81 Removed duplicate check in random_seed test - bug #140 Alexandru Costache 2014-07-04 11:58:14 +03:00
  • 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. Eric Haszlakiewicz 2014-05-03 22:29:10 -04:00
  • 1da0599e0e Fix the definition of the error_description() macro in bits.h now that json_tokener_errors[] is not exported. Eric Haszlakiewicz 2014-05-03 22:26:26 -04:00
  • 3859e99f50 Remove unused variable 'size' Petar Koretić 2014-04-11 10:03:40 +02:00
  • 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. Eric Haszlakiewicz 2014-04-19 20:33:05 -04:00
  • 92a7740e90 Reformat some code in json_object.c Eric Haszlakiewicz 2014-04-19 20:23:54 -04:00
  • 795e9151a1 Add an empty README file to placate autoconf. Eric Haszlakiewicz 2014-04-19 20:22:44 -04:00
  • 4569e3e430 Fix minor typo in README file. Eric Haszlakiewicz 2014-04-19 20:11:05 -04:00
  • 40aab4c502 Merge pull request #133 from haneefmubarak/patch-1 Eric Haszlakiewicz 2014-04-19 20:10:10 -04:00
  • 332a594fd4 Merge pull request #132 from pkoretic/master Eric Haszlakiewicz 2014-04-19 20:05:06 -04:00
  • 7870978c2e Update README.md Haneef Mubarak 2014-04-12 00:40:05 -07:00
  • 23620b827c Update and rename README to README.md Haneef Mubarak 2014-04-12 00:36:08 -07:00
  • fa54bd542e Update the release checklist to include calculating the tarball checksums and updating the wiki. Eric Haszlakiewicz 2014-04-11 20:06:27 -04:00
  • cbf2def5e7 Remove extra <ul>. Eric Haszlakiewicz 2014-04-11 19:51:46 -04:00