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

1119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
openharmony_ci 9750e409e9 !75 漏洞修复：check for NULL in cJSON_DetachItemViaPointer 
Merge pull request !75 from youbing54/master
 2024-09-02 02:17:06 +00:00
youbing54 f9fcedd3b9 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
openharmony_ci ef9690d18e !73 cJson添加后向保护 
Merge pull request !73 from youbing54/master
 2024-08-29 08:07:29 +00:00
youbing54 eef2a51aff IssueNo: https://gitee.com/openharmony/third_party_cJSON/issues/IANAZ1 
describe: cjson添加后向保护
Feature or Bugfix: Bugfix
Binary Source:Yes
Signed-off-by: youbing54<youbing3@huawei.com>
 2024-08-29 11:41:57 +08:00
openharmony_ci 0b1c599c8f !71 jsoncpp添加后向保护 
Merge pull request !71 from youbing54/master
 2024-08-20 08:00:50 +00:00
youbing54 3701afe2a9 IssueNo: https://gitee.com/openharmony/third_party_jsoncpp/issues/IAL5A7 
describe: jsoncpp添加后向保护
Feature or Bugfix: Bugfix
Binary Source:Yes
Signed-off-by: youbing54<youbing3@huawei.com>
 2024-08-20 11:30:13 +08:00
openharmony_ci 1f0243dbd8 !69 代码同步 
Merge pull request !69 from youbing54/master
 2024-07-22 06:48:31 +00:00
youbing54 f9c6ce31f4 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
openharmony_ci 643d85808e !68 cJSON升级1.7.7版本 
Merge pull request !68 from youbing54/master
 2024-07-03 08:41:59 +00:00
youbing54 c717f2eb93 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
openharmony_ci 64ae6aaf97 !66 合入int64特性的补丁 
Merge pull request !66 from borne/br1
 2024-06-25 13:59:27 +00:00
borne 87569a8587 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
openharmony_ci e603594778 !60 调用parse_string增加offset判断 
Merge pull request !60 from 刘波/master
 2024-05-13 09:29:09 +00:00
liubo 14cf937545 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
openharmony_ci 4b09deea67 !59 cJSON编译整改验收 
Merge pull request !59 from youbing54/master
OpenHarmony-v5.0-Beta1 		2024-04-26 07:22:39 +00:00
youbing54 d794393128 Description: CJSON Compilation Rectification 
IssueNo: https://gitee.com/openharmony/third_party_cJSON/issues/I9JSGK
Feature or Bugfix: Feature
Binary Source:Yes
Signed-off-by: youbing54<youbing3@huawei.com>
 2024-04-26 10:46:52 +08:00
openharmony_ci 4878244fd3 !58 cJSON_SetValuestring入参增加判空防止错误调用导致崩溃 
Merge pull request !58 from 刘波/master
 2024-04-08 06:29:52 +00:00
liubo 53cc2fa373 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
openharmony_ci 6c44a5fbc4 !57 第三方cjson部件独立编译整改 
Merge pull request !57 from tongkai0808fh/master
 2024-03-13 08:47:10 +00:00
tongkai0808fh 22d0a0caf0 部件加入innerAPI配置 
Signed-off-by: tongkai0808fh <tongkai5@huawei.com>
 2024-03-13 06:51:53 +00:00
openharmony_ci 21017400e1 !51 修复mini，small报错 
Merge pull request !51 from 谢霆威/master
 2024-02-23 01:23:26 +00:00
openharmony_ci 178e3722b7 !54 fix undefined symbol on macos while link cJSON.dylib 
Merge pull request !54 from fupengfei/master
 2024-02-21 07:42:24 +00:00
fupengfei001 34262b2989 fix undefined symbol on macos while link cJSON.dylib 
Signed-off-by: fupengfei001 <fupengfei6@huawei.com>
 2024-02-21 11:50:34 +08:00
谢霆威 9d217528be Merge branch 'master' of gitee.com:openharmony/third_party_cJSON into master 
Signed-off-by: 谢霆威 <2158863620@qq.com>
 2024-02-19 06:51:44 +00:00
openharmony_ci 9eb4d9dfc7 !52 cJSON部件独立编译改造 
Merge pull request !52 from tongkai0808fh/master
 2024-02-18 07:46:31 +00:00
tongkai0808fh d669f6c15f cJSON部件独立编译整改 
Signed-off-by: tongkai0808fh <tongkai5@huawei.com>
 2024-02-18 06:30:19 +00:00
谢霆威 5d939eee9c !1 临时修改，修复mini，small报错 
Merge pull request !1 from 谢霆威/N/A
 2024-02-05 06:40:25 +00:00
谢霆威 9a534d1d02 临时修改，修复mini，small报错 
Signed-off-by: 谢霆威 <2158863620@qq.com>
 2024-02-05 06:40:11 +00:00
openharmony_ci 05e494eca0 !50 Change: Declare cjson as inner_kits 
Merge pull request !50 from shilong/master
 2024-02-01 11:36:50 +00:00
shilong 736a293e28 Change: Declare cjson as inner_kits 
Signed-off-by: shilong <dragon.shilong@huawei.com>
 2024-02-01 03:23:32 +00:00
shilong a9606be4c0 Change: Declare cjson as inner_kits 
Signed-off-by: shilong <dragon.shilong@huawei.com>
 2024-02-01 03:07:07 +00:00
openharmony_ci b93eba7255 !47 【CI看板】ID为CVE-2023-50471和CVE-2023-50472的漏洞处理 
Merge pull request !47 from 刘波/master
weekly_20240115-v master-v OpenHarmony-v4.1.1-Release OpenHarmony-v4.1-Release 		2023-12-29 02:44:37 +00:00
liubo 8c2fdf2ac6 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
openharmony_ci 1cb3f15297 !46 cJSON三方库升级1.7.16 
Merge pull request !46 from wyk99/master
OpenHarmony-v4.1-Beta1 		2023-11-27 09:09:31 +00:00
w00845693 f1c9937639 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
openharmony_ci d9f215c92a !44 部件名整改 
Merge pull request !44 from 张兴泰/master
OpenHarmony-v4.0-Release OpenHarmony-v4.0-Beta2 		2023-06-30 06:03:49 +00:00
xing-tai-zhang b13dc1f4ac Description: Correct the part name to the cJSON defined by SPLE 
IssueNo: https://gitee.com/openharmony/third_party_cJSON/issues/I6V448
Feature or Bugfix: Bugfix
Binary Source:NO
Signed-off-by: xing-tai-zhang <zhangxingtai@huawei.com>
 2023-06-08 14:52:15 +08:00
openharmony_ci e97241a1bb !43 feat: 添加innerapi_tag 
Merge pull request !43 from cheng_jinsong/fly0516
 2023-06-02 07:10:56 +00:00
chengjinsong2 212690a971 add innertag on third_party_cJSON 
Signed-off-by: chengjinsong2 <chengjinsong2@huawei.com>
 2023-05-17 15:09:28 +08:00
openharmony_ci 9a8dced360 !42 回退 'Pull Request !41 : 部件名整改，将部件名整改为SPLE定义的cJSON' 
Merge pull request !42 from openharmony_ci/revert-merge-41-master
OpenHarmony-v4.0-Beta1 		2023-03-31 09:31:18 +00:00
openharmony_ci df36837f1d 回退 'Pull Request !41 : 部件名整改，将部件名整改为SPLE定义的cJSON' 2023-03-31 09:30:55 +00:00
openharmony_ci eca276f1c4 !41 部件名整改，将部件名整改为SPLE定义的cJSON 
Merge pull request !41 from 张兴泰/master
 2023-03-31 09:07:50 +00:00
xing-tai-zhang fa5c00d462 Description: Correct the part name to the cJSON defined by SPLE 
IssueNo: https://gitee.com/openharmony/third_party_cJSON/issues/I6NEOH
Feature or Bugfix: Bugfix
Binary Source:NO
Signed-off-by: xing-tai-zhang <zhangxingtai@huawei.com>
 2023-03-29 16:24:00 +08:00
openharmony_ci abca1971ca !39 修复未定义board_chaintool_type导致编译报错 
Merge pull request !39 from suwenxiang/master
OpenHarmony-v3.2-Beta5 OpenHarmony-v3.2.4-Release OpenHarmony-v3.2.3-Release OpenHarmony-v3.2.2-Release OpenHarmony-v3.2.1-Release OpenHarmony-v3.2-Beta3 OpenHarmony-v3.2-Release OpenHarmony-v3.2-Beta4 		2022-09-13 06:29:00 +00:00
suwenxiang 25b9d765ca Description: Fix undefined board_chaintool_type resulting in compilation error 
IssueNo: https://gitee.com/openharmony/third_party_cJSON/issues/I5ODQ6
Feature or Bugfix: Bugfix
Binary Source: No
Signed-off-by: suwenxiang <suwenxiang@huawei.com>
 2022-09-09 17:36:32 +08:00
openharmony_ci 6d3d387e93 !35 控制解析层数，防止cJSON库递归解析爆栈风险 
Merge pull request !35 from piggyguy_jdx/master
 2022-08-18 12:35:15 +00:00
jiadexiang 076c7bae42 Description: add CJSON_NESTING_LIMIT as 128 for stack overflow issue 
IssueNo:I5IBWV
Feature or Bugfix: Feature
Binary Source:No

Signed-off-by: jiadexiang <jiadexiang@huawei.com>
 2022-08-15 14:45:17 +08:00
openharmony_ci 8719ea3b6b !33 modify samgr part-name 
Merge pull request !33 from huangxiaolinabc123/730
 2022-08-06 04:21:51 +00:00
openharmony_ci efe0c0f36b !32 解决 iccarm + gn 文件编译问题 
Merge pull request !32 from suwenxiang/master
 2022-07-30 08:39:42 +00:00
huangxiaolinabc123 b8a1fbce1d modify samgr 
Signed-off-by: huangxiaolinabc123 <huangxiaolin12@huawei.com>
Change-Id: Ida26129fe96f79d74996e6f22f6508ba4442dfb8
 2022-07-30 15:25:13 +08:00