openharmony/third_party_cJSON
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_cJSON.git synced 2026-07-22 06:35:22 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,159 Commits 306 Branches 64 Tags
weekly_20260413
Commit Graph

451 Commits

Author SHA1 Message Date
mohaoyuan ea39b8e64d 合入社区修改：fix: prevent NULL pointer dereference in cJSON_SetNumberHelper (#991) 
Signed-off-by: mohaoyuan <mohaoyuan@h-partners.com>
 2026-03-25 20:31:32 +08:00
mohaoyuan 54717684f4 删除print_array print_object深度限制 
Signed-off-by: mohaoyuan <mohaoyuan@h-partners.com>
 2026-03-05 16:10:48 +08:00
mohaoyuan 6c5f1deafd add depth check to prevent stack overflow in cJSON_Print (#984) 
Signed-off-by: mohaoyuan <mohaoyuan@h-partners.com>
 2026-02-26 22:12:08 +08:00
mohaoyuan 9ed9019cba 从社区合入版本1.7.19 
Signed-off-by: mohaoyuan <mohaoyuan@h-partners.com>
 2025-11-07 16:11:39 +08:00
liukaii 210ce064b7 Added max recusrion depth for cJSONDuplicate to prevent stack exhaustion in case of circular reference 
Signed-off-by: liukaii <liukai240@huawei.com>
Change-Id: I8a9429686433c53e14edcd50bbf49a14eb9f9d6c
 2025-07-24 15:21:21 +08:00
liuyuxiu a682cf2485 bugfix 
Signed-off-by: liuyuxiu <1175395694@qq.com>
 2025-06-10 15:39:04 +08:00
youbing54 6a6717948c IssueNo: https://gitee.com/openharmony/third_party_cJSON/issues/IC750Q 
describe: CVE-2023-26819 漏洞修复
Feature or Bugfix: Bugfix
Binary Source:Yes
Signed-off-by: youbing54<youbing3@huawei.com>
 2025-05-13 16:59:15 +08:00
youbing54 63e50e3853 IssueNo: https://gitee.com/openharmony/third_party_cJSON/issues/IC7ESI 
describe: 回退64位修改
Feature or Bugfix: Bugfix
Binary Source:Yes
Signed-off-by: youbing54<youbing3@huawei.com>
 2025-05-13 14:30:05 +08:00
youbing54 a20bc3ab70 IssueNo: https://gitee.com/openharmony/third_party_cJSON/issues/IC740N 
describe: CVE-2023-26819 代码回退
Feature or Bugfix: Bugfix
Binary Source:Yes
Signed-off-by: youbing54<youbing3@huawei.com>
 2025-05-12 15:34:18 +08:00
jiangtao57 9e0012644b fix 【漏洞修复】 CVE-2023-26819 
Signed-off-by: jiangtao57 <jiangtao57@huawei.com>
Change-Id: I34a9b7a2e4800aca7cc91635bd2414639f9c42de
 2025-05-09 21:04:13 +08:00
youbing54 f626b04cf0 IssueNo: https://gitee.com/openharmony/third_party_cJSON/issues/IANUKP 
describe: check for NULL in cJSON_DetachItemViaPointer
Feature or Bugfix: Bugfix
Binary Source:Yes
Signed-off-by: youbing54<youbing3@huawei.com>
 2024-08-31 16:36:40 +08:00
youbing54 1bc8ffbc12 IssueNo: https://gitee.com/openharmony/third_party_cJSON/issues/IAEKV4 
describe: Code synchronization
Feature or Bugfix: Bugfix
Binary Source:Yes
Signed-off-by: youbing54<youbing3@huawei.com>
 2024-07-22 11:13:46 +08:00
youbing54 d25a789010 IssueNo: https://gitee.com/openharmony/third_party_cJSON/issues/IAA61F 
describe: Upgrade cJSON to version 1.7.7
Feature or Bugfix: Bugfix
Binary Source:Yes
Signed-off-by: youbing54<youbing3@huawei.com>
 2024-07-03 11:34:53 +08:00
borne ac1e4b1368 feat: add int64 support 
Offering: Open Source Institute

This commit adds int64 support for cjson. To enable int64, you need to define the macro ENABLE_INT64. To make it more clear, you need to build cjson like this if you are using makefile:

mkdir build
cd build
cmake -DENABLE_INT64=ON ..
make

This implementation changed the type of valueint in struct cJSON: from int to long long(int64), and added a new flag cJSON_IsInt64.
For a int64 cJSON item, the value of item->type would be cJSON_Number | cJSON_IsInt64.

The existing functions parse_number and print_number can handle int64 now.

Considering we have added a new type cJSON_IsInt64, some new functions have been added:
CJSON_PUBLIC(long long *) cJSON_GetInt64NumberValue(cJSON * const item)
CJSON_PUBLIC(cJSON_bool) cJSON_IsInt64Number(const cJSON * const item)
CJSON_PUBLIC(cJSON *) cJSON_CreateInt64Number(long long integer)
CJSON_PUBLIC(cJSON*) cJSON_AddInt64NumberToObject(cJSON * const object, const char * const name, const long long integer)
CJSON_PUBLIC(long long) cJSON_SetInt64NumberValue(cJSON * const object, const long long integer)

And some existing functions are also adjusted for int64, including parse_number, cJSON_SetNumberHelper, print_number, cJSON_CreateNumber, cJSON_Compare and compare_json(in cJSON_Utils).

Besides the code changes, we have also added some testcases for int64.
These tests will run if ENABLE_INT64 is turned on.

Ref:PeterAlfredLee
https://github.com/DaveGamble/cJSON/pull/689

Signed-off-by: borne <bo.lu@huawei.com>
 2024-06-21 13:05:42 +08:00
liubo 7acf128126 Description: 调用parse_string增加offset判断 
IssueNo:https://gitee.com/openharmony/third_party_cJSON/issues/I9OUF5
Binary Source:No
Signed-off-by: liubo419 <liubo419@huawei.com>
 2024-05-13 14:39:19 +08:00
liubo 4b5450b732 Description: cJSON_SetValuestring入参增加判空防止错误调用导致崩溃 
IssueNo:https://gitee.com/openharmony/third_party_cJSON/issues/I9EP9J
Feature or Bugfix: Bugfix
Binary Source:No
Signed-off-by: liubo419 <liubo419@huawei.com>
 2024-04-08 10:07:07 +08:00
liubo 1a6a39119e Description: 漏洞处理 
IssueNo:https://gitee.com/openharmony/third_party_cJSON/issues/I8S4Y8
Feature or Bugfix: Bugfix
Binary Source:No
Signed-off-by: liubo419 <liubo419@huawei.com>
 2023-12-28 17:40:30 +08:00
w00845693 7a7ebff009 Description: updata user guide 
IssueNo: https://gitee.com/openharmony/third_party_cJSON/issues/I8JGFE
Feature or Bugfix: Feature
Binary Source:No
Signed-off-by: wyk99 <wangyuekai1@huawei.com>
 2023-11-27 09:46:09 +08:00
jiadexiang 036ad89d17 Description: update version to v1.7.15 
IssueNo:I5CE1Z
Feature or Bugfix: Feature
Binary Source:No

Signed-off-by: jiadexiang <jiadexiang@huawei.com>
 2022-06-15 15:04:36 +08:00
mamingshuai a006830083 update openharmony 1.0.1 2021-03-11 20:34:23 +08:00
wenjun 2c251595b3 add OpenHarmony 1.0 baseline 2020-09-09 09:26:41 +08:00
Alanscut 353822ffd2 Update version to 1.7.13 2020-04-02 23:34:28 +08:00
Alanscut e8c9bc8306 fix error C2124 in visual studio 2020-04-02 23:32:30 +08:00
Alan Wang 752bdb7931 Merge pull request #454 from Alanscut/float-compare 
comparing double value with DBL_EPSILON
 2020-04-02 20:09:42 +08:00
Alan Wang 8813f0097d Merge pull request #453 from Alanscut/add-return-value 
add return value for  cJSON_AddItemTo... and cJSON_ReplaceItemxxx
 2020-04-02 19:41:56 +08:00
Alan Wang 356e3017c8 Merge pull request #451 from Alanscut/20200324 
add new function of `cJSON_SetValuestring`
 2020-04-02 19:40:03 +08:00
Sang-Heon Jeon 82e2998955 Add getNumberValue function 
* Add GetNumberValue function and testcase

Co-authored-by: Alan Wang <wp_scut@163.com>
 2020-04-02 19:36:35 +08:00
caglarivriz 867826ec51 Added cJSON_ParseWithLength (#358) 
Co-authored-by: Caglar Ivriz <caglar.ivriz@siemens.com>
 2020-04-02 19:24:36 +08:00
Alanscut b8c15e3ee9 comparing double value with DBL_EPSILON 2020-04-02 16:02:24 +08:00
Alanscut 357e6e8c64 add return value for cJSON_ReplaceItemxxx 2020-04-02 11:00:10 +08:00
Alanscut 9e18bf3836 false has been redefined to cJSON_False 2020-04-01 19:19:00 +08:00
Alanscut 0f7551e802 add return value for cJSON_AddItemTo... 2020-03-26 14:18:52 +08:00
Alanscut b31955beb8 update cJSON_SetValuestring and testcase 2020-03-25 15:38:54 +08:00
Alanscut 3514b88828 add new function of setValuestringToObject 2020-03-24 22:28:15 +08:00
Alan Wang 581c0decbd Improve performance of adding item to array (#448) 
* use prev pointer when adding item to array

Co-authored-by: xiaomianhehe <hongshaokai@hotmail.com>
Co-authored-by: Alanscut <scut@163.com>

Date:   Tue Feb 18 11:54:23 2020 +0800

* add testcase for cJSON_DeleteItemFromArray
 2020-03-24 16:17:25 +08:00
Alan Wang a7da4d9079 Revert "use prev pointer when array do adding (#430)" 
This reverts commit bb610a77a3.
 2020-03-16 23:04:39 +08:00
xiaomianhehe bb610a77a3 use prev pointer when array do adding (#430) 
* use prev pointer when array do adding
 2020-02-18 11:54:23 +08:00
Alanscut 93e71db3e1 remove annoying float-equal option 2020-01-18 23:18:19 +08:00
Alanscut e2f1b150f9 improve compare_double function 2019-12-06 18:16:27 +08:00
Alanscut c523c91b85 Merge branch 'master' into master 2019-12-06 15:14:26 +08:00
rolegic 964f099380 Fixed different argument between declaration and definition 2019-11-15 15:43:43 +01:00
Alanscut 29ef6058da Merge pull request #377 from Alanscut/20190628 
fix bug: add const to the parameter in the cJSON_GetStringValue function
 2019-10-20 22:47:11 +08:00
Alanscut cac69c6a6a Merge pull request #395 from bjda/more_const 
Add const qualifier to cJSON_CreateStringArray
 2019-10-20 22:46:05 +08:00
Julian Ste c2b3a256a5 initilize variables in print_number 2019-10-19 13:53:21 +02:00
Bernt Johan Damslora 5234eaad64 Add const qualifier to cJSON_CreateStringArray 
Adds a const qualifier to the strings in the array to avoid discarding
it from arguments.
 2019-10-17 14:03:15 +02:00
Alanscut be8921b66b Revert "Replace strcpy with strncpy, sprintf with snprintf" 2019-09-21 17:42:25 +08:00
Alanscut 1d9caef8ab Merge pull request #388 from singku/secure_c 
Replace strcpy with strncpy, sprintf with snprintf
 2019-09-21 15:43:13 +08:00
Alanscut 7548ab4da8 fix const cast warnings in cJSON_GetStringValue 2019-06-28 14:22:02 +08:00
Sanjeev BA bd35e408c3 Fix typos. 
Signed-off-by: Sanjeev BA <iamsanjeev@gmail.com>
 2019-06-16 07:58:03 +09:00
Paweł Malowany 07e04dd70c Fix clang -Wfloat-equal warning 2019-06-10 11:37:03 +02:00