Commit Graph

  • 533ff8a783
    Merge pull request #405 from Alanscut/issue-404 Alanscut 2019-11-02 22:38:33 +08:00
  • 4755aea837 fix make failed in mac os Alanscut 2019-11-01 11:30:14 +08:00
  • 4454731775 update readme Alanscut 2019-10-29 16:14:22 +08:00
  • 326f1f5ed5
    Merge pull request #402 from Alanscut/cmake_add_uninstall_target Alanscut 2019-10-29 16:09:32 +08:00
  • bb059dc2e1 add uninstall target in cmake Alanscut 2019-10-29 15:48:11 +08:00
  • de99175cd0
    fix rmdir error (#401) Alanscut 2019-10-29 14:21:16 +08:00
  • a417b183c6 add new line to endif Alanscut 2019-10-29 12:47:36 +08:00
  • 9a6442d57b fix rmdir error Alanscut 2019-10-29 11:40:24 +08:00
  • a78c28e6d1 Merge branch 'master' of https://github.com/DaveGamble/cJSON Alanscut 2019-10-28 22:45:30 +08:00
  • f589f81a42
    Merge pull request #400 from randy408/fuzz Alanscut 2019-10-22 21:07:52 +08:00
  • 49a0ede475 ossfuzz: build with c++ compiler Randy 2019-10-22 13:37:41 +02:00
  • 73b0e739d0 fuzz: add support for compiling with c++ compiler Randy 2019-10-22 13:32:41 +02:00
  • a0fdf115be
    Merge pull request #398 from randy408/fuzz Alanscut 2019-10-22 18:48:47 +08:00
  • 6b728982f2 ossfuzz.sh: fix permission bits Randy 2019-10-22 12:45:13 +02:00
  • f00060af44
    Merge pull request #378 from randy408/fuzz Alanscut 2019-10-22 11:22:30 +08:00
  • ec8d2f9c2e convert fuzz target to c89, optimize randy408 2019-10-21 15:27:47 +02:00
  • 18b7113b49
    Merge pull request #351 from GitMensch/patch-1 Alanscut 2019-10-21 17:06:14 +08:00
  • 18dad60035
    Merge pull request #377 from Alanscut/20190628 Alanscut 2019-10-20 22:47:11 +08:00
  • 66d0a1793f
    Merge pull request #395 from bjda/more_const Alanscut 2019-10-20 22:46:05 +08:00
  • 1cd10fdb3c Merge branch 'master' of https://github.com/Alanscut/cJSON Alanscut 2019-10-19 23:22:49 +08:00
  • a8dbf6d878
    Merge pull request #343 from myd7349/fix-install-path Alanscut 2019-10-19 22:57:48 +08:00
  • 60fb788aa5
    Merge pull request #396 from julian-st/master Alanscut 2019-10-19 22:23:45 +08:00
  • 8554399bed
    Update CMakeLists.txt Sizhe Zhao 2019-10-19 21:15:01 +08:00
  • bcc91ecbc3
    initilize variables in print_number Julian Ste 2019-10-19 13:53:21 +02:00
  • 26772a8ef7 Add const qualifier to cJSON_CreateStringArray Bernt Johan Damslora 2019-10-17 14:03:15 +02:00
  • 36d0fddc5d Merge remote-tracking branch 'upstream/master' Alanscut 2019-10-17 16:27:29 +08:00
  • dc56e24f7f add build script randy408 2019-10-14 17:12:13 +02:00
  • ea6700fe39 Merge branch 'master' of https://github.com/DaveGamble/cJSON Alanscut 2019-10-08 09:15:24 +08:00
  • f31ff795bd
    Merge pull request #392 from Alanscut/fix-readme-typos Alanscut 2019-10-08 09:10:54 +08:00
  • 71dcbee975 Merge branch 'master' of https://github.com/DaveGamble/cJSON Alanscut 2019-10-08 09:04:35 +08:00
  • e52b212dbf fix typos in REAM.md file Alanscut 2019-09-29 18:53:21 +08:00
  • 038452d874 Merge remote-tracking branch 'upstream/master' Alanscut 2019-09-29 18:28:03 +08:00
  • 2de7d04aaf
    Merge pull request #389 from DaveGamble/revert-388-secure_c Alanscut 2019-09-24 10:20:41 +08:00
  • ae49da2b61
    Revert "Replace strcpy with strncpy, sprintf with snprintf" Alanscut 2019-09-21 17:42:25 +08:00
  • a3154a36f1
    Merge pull request #388 from singku/secure_c Alanscut 2019-09-21 15:43:13 +08:00
  • d65668b8b7 Merge branch 'master' of https://github.com/DaveGamble/cJSON Alanscut 2019-09-11 10:43:38 +08:00
  • 189b51c5da format comment Alanscut 2019-09-11 10:42:44 +08:00
  • 18a5ea83a9 Merge branch 'master' of https://github.com/DaveGamble/cJSON Alanscut 2019-09-11 10:41:40 +08:00
  • 1d1e3080fa format comment Alanscut 2019-09-11 09:57:03 +08:00
  • 709c3dcf32
    Merge pull request #374 from Alanscut/20190625 Alanscut 2019-09-11 09:53:19 +08:00
  • c61573f1af format adjustment Alanscut 2019-09-11 09:51:30 +08:00
  • 20cffa37a8
    Merge pull request #380 from vemakereporter/master Alanscut 2019-09-11 09:00:44 +08:00
  • cf0d87a095
    Merge pull request #384 from Alanscut/eliminate_warning Alanscut 2019-08-28 20:57:02 +08:00
  • e750194cb1
    Merge pull request #386 from lntuition/master Alanscut 2019-08-28 20:56:06 +08:00
  • e13f11ba79
    Merge pull request #360 from Alanscut/master Alanscut 2019-08-27 14:50:48 +08:00
  • 8872b1429a
    Merge pull request #371 from basanjeev/master Alanscut 2019-08-26 16:33:05 +08:00
  • bd1a375028 add fuzzer driver, integrate with build system Randy 2019-08-24 17:42:48 +02:00
  • b6da0d6565
    Correct typo error Sang-Heon Jeon 2019-08-24 22:43:33 +09:00
  • 8c94157daf Change bracket style lntuition 2019-08-14 23:06:43 +09:00
  • c5b5f1eb6e Add GetNumberValue function lntuition 2019-08-14 22:11:07 +09:00
  • 166c814cda eliminate warning when compiling cJSON Alanscut 2019-08-12 17:06:29 +08:00
  • c680faea56
    Update Makefile Vemake 2019-07-24 20:46:41 +08:00
  • 2d6db59c7b update fuzzer Randy 2019-07-11 15:09:10 +02:00
  • e6bc5d16e6 update fuzzer Randy 2019-07-11 15:03:04 +02:00
  • 2691e142f4 update fuzzer Randy 2019-07-11 14:42:27 +02:00
  • f7f175fdf2 add fuzz target Randy 2019-07-11 13:56:07 +02:00
  • 9d766f07a7 fix const cast warnings in cJSON_GetStringValue Alanscut 2019-06-28 14:22:02 +08:00
  • 358a1d3b57 bug fixed Kumaria 2019-06-26 14:25:38 -07:00
  • e8f2a0ae79 bug introduced Kumaria 2019-06-26 14:20:50 -07:00
  • 85ceadb4b4 Add a comment to the parameter count of the cJSON_CreateIntArray function. Alanscut 2019-06-25 17:25:23 +08:00
  • 2d9d445e15
    this is the include I needed... karelv 2019-06-18 15:50:20 -07:00
  • 110f184d18 Fix typos. Sanjeev BA 2019-06-16 07:58:03 +09:00
  • 1b535b28e4
    Remove excess array=null check mrfearless 2019-06-11 14:55:16 +01:00
  • c9e8a68b00 Fix clang -Wfloat-equal warning Paweł Malowany 2019-06-10 10:59:31 +02:00
  • c575ab8e9d
    Helper functions for creating and adding items to an array at the same time: cJSON_AddNullToArray, cJSON_AddTrueToArray, cJSON_AddFalseToArray, cJSON_AddBoolToArray, cJSON_AddNumberToArray, cJSON_AddStringToArray, cJSON_AddRawToArray, cJSON_AddArrayToArray, cJSON_AddObjectToArray mrfearless 2019-06-07 19:00:04 +01:00
  • 0c568d495b
    fix #287 static-analyzer warning Simon Sobisch 2019-06-07 10:03:55 +02:00
  • 9c4a63fbdc add cJSON_CreateBoolArray for boolean type of array hongbo.wang 2019-06-04 18:01:27 +08:00
  • 1dcf5ee762 Improve the parse_number function and report an error when parsing a number starting with multiple zeros. Alanscut 2019-05-31 18:09:00 +08:00
  • 16f56300e4 Replace strcpy with strncpy, sprintf with snprintf singku 2019-05-29 21:25:33 +00:00
  • 5fe80a94b6 add comment for cJSON_Minify function Alan_scut 2019-05-22 10:24:13 +08:00
  • cc8d98debe Added cJSON_ParseWithLength Caglar Ivriz 2019-05-20 10:31:20 +03:00
  • 3c8935676a
    Merge pull request #355 from DaveGamble/release-1.7.12 v1.7.12 Max Bruckner 2019-05-17 01:05:59 +02:00
  • b93fd34044 Update changelog and contributors Max Bruckner 2019-05-17 00:37:26 +02:00
  • 687b1a2fe1 Update version to 1.7.12 Max Bruckner 2019-05-16 20:03:12 +02:00
  • 08d2bc766a Fix infinite loop in cJSON_Minify Max Bruckner 2019-05-16 20:01:02 +02:00
  • 465352fb99
    Merge pull request #352 from tan-wei/master Max Bruckner 2019-05-11 12:06:26 +02:00
  • 19ff92da79 Add link dependency to fix tests link error when ENABLE_CJSON_UTILS is ON Winterreise 2019-05-11 07:37:33 +08:00
  • 3a4cfa84c3
    allow to override PIC_FLAGS and compiler std Simon Sobisch 2019-05-06 21:07:06 +02:00
  • 62bc2e3432
    Merge pull request #347 from raiden00pl/master Max Bruckner 2019-04-28 13:31:46 +02:00
  • 359567fdde Undef true and false first also for cJSON_Utils.c raiden00pl 2019-04-28 10:33:44 +02:00
  • 0b5a7abf48
    Merge pull request #340 from ldm0/master Max Bruckner 2019-04-15 23:06:11 +02:00
  • 93688cbe72
    Merge pull request #344 from DaveGamble/release-1.7.11 v1.7.11 Max Bruckner 2019-04-15 00:17:19 +02:00
  • 6b249213dd Fix clang -Wcomma warning Max Bruckner 2019-04-15 00:06:35 +02:00
  • 09ebae8149 Release cJSON 1.7.11 Max Bruckner 2019-04-14 23:58:02 +02:00
  • a43fa56a63 Rewrite cJSON_Minify, fixing buffer overflows, fixes #338 Max Bruckner 2019-04-14 23:13:41 +02:00
  • 9a970b9ff6 CMake: Improve install target myd7349 2019-04-14 19:41:28 +08:00
  • 5a52eaddfd Undef true and false first, fixes #339 Max Bruckner 2019-04-13 01:44:23 +02:00
  • 663ed85b83 update code JayHou 2019-03-20 15:37:28 +08:00
  • add86a6be8 Update cJSON.c Donough Liu 2019-03-18 22:56:34 +08:00
  • 3b78b68578 Fix typos. Sanjeev BA 2019-02-10 08:39:40 +09:00
  • 91791856de Use strncpy to avoid static analyzer false positives. Max Bruckner 2018-12-20 18:15:05 +01:00
  • 4f06d108f9 fix a bug in cJson.c print_int() Bwar 2019-01-23 18:20:59 +08:00
  • aac145ecae fix a bug in cJson.c print_int() Bwar 2019-01-23 18:18:30 +08:00
  • 31579d6a13 add INT_MAX define Bwar 2019-01-23 12:36:23 +08:00
  • fea0f1851e add key traverse. 增加遍历获取json key,调用GetKey()函数获取,使用方式见demo Bwar 2019-01-04 16:19:52 +08:00
  • 551590c54a add key traverse. 增加遍历获取json key,调用GetKey()函数获取,使用方式见demo Bwar 2019-01-04 16:15:08 +08:00
  • c69134d017 Release Version 1.7.10 v1.7.10 Max Bruckner 2018-12-20 18:15:05 +01:00
  • 563d861f92 cJSON_Utils: sort_lists: Properly split the lists Max Bruckner 2018-12-20 18:12:23 +01:00
  • 6820448db5 libcjson.pc.in: Use Libs.private instead of Private Max Bruckner 2018-12-20 18:04:52 +01:00
  • d44b594ab3 Add missing changelog entry Max Bruckner 2018-12-16 11:21:35 +01:00