3party/cJSON
0
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2025-01-13 18:57:57 +08:00
Code Issues Projects Releases Wiki Activity
1,080 Commits 11 Branches 48 Tags 3.6 MiB
Commit Graph

1080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alanscut
87d8f0961a Release 1.7.17 
update version to 1.7.17
v1.7.17 		2023-12-26 10:24:36 +08:00
Lee
f66cbab4bf
fix error in null checkings (#810) 
fixes #802 and #803
 2023-12-20 11:05:23 +08:00
Lee
60ff122ef5
add NULL checkings (#809) 
* add NULL checks in cJSON_SetValuestring

Fixes #803(CVE-2023-50472)

* add NULL check in cJSON_InsertItemInArray

Fixes #802(CVE-2023-50471)

* add tests for NULL checks

add tests for NULL checks in cJSON_InsertItemInArray and cJSON_SetValuestring
 2023-12-18 11:47:52 +08:00
Alan Wang
cb8693b058
Release 1.7.16 (#770) 
* Update version to 1.7.16

* Update contributors
v1.7.16 		2023-07-05 11:22:19 +08:00
Alan Wang
545710e3bf
upgrade clang to fix actions error (#768) 
Actions builds are failing because clang-8 is failing to be installed. Upgrade clang-8 to clang-14 to fix this.
 2023-07-04 17:02:03 +08:00
MaxBrandtner
543c28869e
Add meson documentation (#761) 2023-07-03 09:35:30 +08:00
hopper-vul
766dd9d590
Fix a null pointer crash in cJSON_ReplaceItemViaPointer (#726) 
If the parent passed in cJSON_ReplaceItemViaPointer has not a child, which means parent->child is null, a null pointer dereference crash will be happened inside cJSON_ReplaceItemViaPointer.

This commit adds the NULL check of `parent->child` beforehand to inform user such incorrect usage.

Signed-off-by: hopper-vul <hopper.vul@gmail.com>
 2023-07-01 16:18:32 +08:00
Junbo Zheng
b45f48e600
fix: add allocate check for replace_item_in_object (#675) 
Signed-off-by: Junbo Zheng <zhengjunbo1@xiaomi.com>
 2022-03-29 15:02:59 +08:00
Stoian Ivanov
a6424b85dd
feat: add cJSON_SetBoolValue and test (#639) 
* cJSON_SetBoolValue plus test

* cJSON_Invalid insted of just 0

* Update tests/misc_tests.c

* VSCode standard C formater applied

Co-authored-by: Alan Wang <wp_scut@163.com>
 2022-01-26 20:24:50 +08:00
mohawk2
3cecc40466
docs: Fix README typo (#664) 2022-01-26 20:23:33 +08:00
Randy
2fc55f6793
chore: add CIFuzz integration (#437) 
* CIFuzz integration

* Rename main.yml to ci-fuzz.yml
 2022-01-20 14:23:57 +08:00
Tony Langhammer
c7025b093a
chore: ignore all .dylib files (#628) 
This fixes some .dylib files being flagged as added when compiled e.g. `libcjson.dylib.1.7.14`
 2022-01-20 14:17:46 +08:00
10km
e7ebe77ebf
fix: 'cjson_utils-static' target not exist(#625) 
* Update CMakeLists.txt

fix the bug:when build with cmake using option '-DBUILD_SHARED_AND_STATIC_LIBS=ON -DENABLE_CJSON_UTILS=ON', build sucess,
but use cmake comand 'find_package(cjson CONFIG)', 'cjson_utils' target is available,but  'cjson_utils-static' target not exist.
 2022-01-19 16:28:29 +08:00
Andy
61eb84d991
add an option for ENABLE_CJSON_VERSION_SO in CMakeLists.txt (#534) 
Co-authored-by: m00209177 <malihu@huawei.com>
 2022-01-19 14:45:02 +08:00
AlexanderVasiljev
d321fa9e6e
fix: print int without decimal places (#630) 2022-01-19 10:30:31 +08:00
Alan Wang
203a0dec6f
chore: ignore *.lst/*.lss file (#623) 2021-10-22 16:21:55 +08:00
Joshua Arulsamy
c77a688927
build: Bump cmake version and use new version syntax (#587) 
Co-authored-by: Alan Wang <wp_scut@163.com>
 2021-10-22 16:15:19 +08:00
Alan Wang
e5dbaee131
docs: update comment (#622) 2021-10-22 16:09:45 +08:00
SuperHuan
189dcde644
fix: add cmake_policy to CMakeLists.txt (#613) 
Use the cmake_policy() command to set CMP0054 to NEW explicitly.
 2021-10-22 16:02:06 +08:00
Sayan Bandyopadhyay
b9eff8b02a
fix: for issue #569, now use the guard to turn it off (#617) 2021-10-22 15:57:05 +08:00
Alan Wang
f50dafc7d0
fix: potential memory leak in merge_patch() (#611) 2021-08-26 14:13:42 +08:00
Alan Wang
d348621ca9
chore: update version and changelog (#610) v1.7.15 2021-08-25 19:15:09 +08:00
Alan Wang
744e47353a
fix: remove redundant condition (#605) 2021-08-25 15:02:00 +08:00
Dimitri Papadopoulos Orfanos
7795249dd4
Typos found by codespell (#607) 2021-08-25 15:01:12 +08:00
CoffeeTableEspresso
324a6ac9a9
Update .gitattributes (#544) 2020-12-31 10:38:10 +08:00
Alan Wang
6ea4c01e4e
Fix potential core dumped for strrchr (#546) 2020-12-31 10:26:39 +08:00
Jordan IMBERT
9226e4ed8c
Remove always true condition in cJSON.c (#539) 2020-12-17 17:07:18 +08:00
Alan Wang
7b6645794d
Fix null pointer crash, closes #536 (#538) 2020-12-17 15:42:31 +08:00
Tim Gates
4100379a04
docs: fix simple typo, transfering -> transferring (#527) 
There is a small typo in tests/readme_examples.c.

Should read `transferring` rather than `transfering`.
 2020-11-16 08:57:02 +08:00
mongobaba
2f6fc7f0f2
fix several null pointer problems on allocation failure (#526) 2020-11-12 11:46:15 +08:00
Alan Wang
a1e1c208ff
Merge pull request #519 from Alanscut/issue-516 
fix a possible dereference of null pointer
 2020-10-16 17:12:54 +08:00
Alanscut
9bf4960cd5 fix a possible dereference of null pointer 2020-10-16 17:06:29 +08:00
Alan Wang
488169faca
Merge pull request #518 from fpnuseis/master 
fix: windows build failure about defining nan
 2020-10-16 16:52:10 +08:00
Use
9931900768 fix: windows build failure about defining nan 2020-10-15 11:52:06 +09:00
Alan Wang
d2735278ed
Merge pull request #505 from Alanscut/release-1.7.14 
Release 1.7.14
v1.7.14 		2020-09-03 17:14:26 +08:00
Alanscut
8e84db4c4e Update changelog and contributors 2020-09-03 17:11:02 +08:00
Alanscut
8e357f825b Update version to 1.7.14 2020-09-03 17:07:49 +08:00
Alan Wang
2e5171d8d6
Merge pull request #503 from Alanscut/issue499 
optimize the way to find tail node
 2020-09-03 11:51:54 +08:00
Alanscut
c8ca78a3cc optimize the way to find tail node 2020-09-02 20:23:52 +08:00
Alan Wang
0b13220419
Merge pull request #502 from Alanscut/nan 
remove float-divide-by-zero for supporting NAN
 2020-08-27 20:48:25 +08:00
Alanscut
23f027139e remove float-divide-by-zero for supporting NAN 2020-08-27 20:46:00 +08:00
Alan Wang
60c3b0a571
Merge pull request #501 from Alanscut/actions 
add github actions CI
 2020-08-27 20:28:06 +08:00
Alanscut
857c037ccc add github actions CI 2020-08-27 20:26:04 +08:00
Alan Wang
3fb9d929e1
Merge pull request #484 from sappo/master 
Problem: WError error on macosx because NAN is a float
 2020-08-21 21:30:19 +08:00
Alan Wang
cf97c6f066
Merge pull request #485 from HuKeping/fix-git-archive 
Remove unnecessary files in release tarball
 2020-06-27 16:13:52 +08:00
h00283522
1ef4deec06 Remove unnecessary files in release tarball 
Prior to this patch, we would find '.gitignore', '.travisCI.yml' in
the release tarball.

This patch adds a few entries in .gitattributes to specify files that
should never end up in a distribution tarball.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2020-06-26 10:53:16 +08:00
Kevin Sapper
4578d3a9e1 Problem: WError error on macosx because NAN is a float 
Solution: Add explicit cast from NAN to double
 2020-06-23 09:17:32 +02:00
Alanscut
b95a4c56b0 fix #376 2020-06-22 11:23:24 +08:00
Alan Wang
7db005e028
Merge pull request #472 from Alanscut/parse-array 
array's item should be in the list
 2020-05-06 17:34:15 +08:00
Alanscut
1fc755ac09 array's item should be in the list 2020-05-06 17:18:42 +08:00
Alan Wang
a82449fa3e
Merge pull request #456 from miaoerduo/master 
fix: some bugs in detach and replace, resolved #467
 2020-05-06 17:07:33 +08:00
Alan Wang
2a6299d904
Merge pull request #469 from moorthy-bs/master 
pkgconfig: cjson include dir added
 2020-05-05 11:34:23 +08:00
Alan Wang
43f471bff1
Merge pull request #465 from Summus-git/fix_make_install_config 
Make install unwanted config files
 2020-05-05 11:31:39 +08:00
Moorthy
7103844037 pkgconfig: cjson include dir added 
fixed #468
 2020-04-30 12:45:10 +02:00
Romain Lesteven
3442b36672 Fix make.sh install unwanted config files 2020-04-17 12:01:39 +02:00
miaoerduo
cb4661cd91 fix: errors in replacing the first item when array_size is 1, and replacing the last item 2020-04-03 17:21:02 +08:00
miaoerduo
a65abf2f4f fix: error list head's prev when detach the last item 2020-04-03 17:20:57 +08:00
miaoerduo
3999b12848 feat: set list head's prev in parse_array and parse_object 2020-04-03 17:20:42 +08:00
Alanscut
39853e5148 Update changelog v1.7.13 2020-04-02 23:35:50 +08:00
Alanscut
ff0dabc72e Update version to 1.7.13 2020-04-02 23:34:28 +08:00
Alanscut
5d55c6c2ee fix error C2124 in visual studio 2020-04-02 23:32:30 +08:00
Alan Wang
23e4fbc639
Merge pull request #454 from Alanscut/float-compare 
comparing double value with DBL_EPSILON
 2020-04-02 20:09:42 +08:00
Alan Wang
65578af8cc
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
f12cd7b701
Merge pull request #451 from Alanscut/20200324 
add new function of `cJSON_SetValuestring`
 2020-04-02 19:40:03 +08:00
Sang-Heon Jeon
97cf1d84e4 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
983bb2b4d6 Added cJSON_ParseWithLength (#358) 
Co-authored-by: Caglar Ivriz <caglar.ivriz@siemens.com>
 2020-04-02 19:24:36 +08:00
Alanscut
4e114c1f31 update testcase, fixes #433 2020-04-02 16:24:10 +08:00
Alanscut
8943c73345 comparing double value with DBL_EPSILON 2020-04-02 16:02:24 +08:00
Alanscut
af56a146fd update testcase 2020-04-02 11:06:47 +08:00
Alanscut
131966f748 add return value for cJSON_ReplaceItemxxx 2020-04-02 11:00:10 +08:00
Alanscut
bd7cbe9776 false has been redefined to cJSON_False 2020-04-01 19:19:00 +08:00
Alanscut
54d6b8016e add return value for cJSON_AddItemTo... 2020-03-26 14:18:52 +08:00
Alanscut
31c7880fab update cJSON_SetValuestring and testcase 2020-03-25 15:38:54 +08:00
Alanscut
34e102d0dc update README 2020-03-24 22:28:35 +08:00
Alanscut
4790c3c8f5 add testcase for cJSON_SetValuestringToObject 2020-03-24 22:28:27 +08:00
Alanscut
6b35f1c5bc add new function of setValuestringToObject 2020-03-24 22:28:15 +08:00
Alan Wang
3ece4c893c
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
Alanscut
fa28d82f2e update contributors 2020-03-19 22:58:04 +08:00
Alan Wang
1be85ff26d
Merge pull request #447 from Alanscut/fix_encode_string_as_pointer 
Fix encode_string_as_pointer
 2020-03-18 16:53:52 +08:00
Alanscut
d92c0de7e8 fix encode_string_as_pointer 2020-03-18 16:04:58 +08:00
Alan Wang
ae7a7a1d0c
Merge pull request #440 from Square789/patch-1 
updating doc
 2020-03-16 23:12:14 +08:00
Alan Wang
0586a6c437
Merge pull request #446 from DaveGamble/revert-430-array_add 
Revert "use prev pointer when array do adding"
 2020-03-16 23:08:06 +08:00
Alan Wang
9034a9cd0b Revert "use prev pointer when array do adding (#430)" 
This reverts commit e8077d01500279a7b45b8cd7a0ae94ea7ad5748a.
 2020-03-16 23:04:39 +08:00
Square789
b0e7195a74
Spelling; "it's"->"its" 2020-03-09 13:40:08 +01:00
xiaomianhehe
e8077d0150
use prev pointer when array do adding (#430) 
* use prev pointer when array do adding
 2020-02-18 11:54:23 +08:00
Alan Wang
2955fe5ec4
Merge pull request #431 from DevGim/dev 
formatting README.md
 2020-02-11 14:18:50 +08:00
dm8.kim
895b9ad344 formatting README.md 2020-02-11 13:25:02 +09:00
Alanscut
f790e17b6c update content in README 2020-01-19 15:23:48 +08:00
Alan Wang
2c97086b97
Merge pull request #425 from NancyLi1013/vcpkg-instructions 
Add vcpkg installation instructions
 2020-01-19 15:10:54 +08:00
NancyLi1013
ada2169183 Update changes 2020-01-18 23:08:59 -08:00
NancyLi1013
cc78050ff4 Add vcpkg installation instructions 2020-01-18 22:47:46 -08:00
Alanscut
74b2f03837 remove annoying float-equal option 2020-01-18 23:18:19 +08:00
Alanscut
fa8b454552 correct mistake 2020-01-16 17:10:52 +08:00
Alanscut
2d4ad84192
Merge pull request #418 from Alanscut/update_Changelog 
update CHANGELOG
 2019-12-10 17:38:45 +08:00
Alanscut
ea532cdd61 update CHANGELOG.md 2019-12-10 17:20:46 +08:00
Alanscut
4e3335618f improve compare_double 2019-12-09 10:36:45 +08:00
Alanscut
69bc9ccc20
Merge pull request #417 from zjuchenyuan/patch-1 
Update cJSON_Utils.c to avoid ‘CJSON_DOUBLE_PRECIION’ undeclared
 2019-12-09 08:54:55 +08:00
ChenYuan
ea3a6dcd69
Update cJSON_Utils.c 
fix typo
 2019-12-07 20:24:07 +08:00
Alanscut
c06d8264d0 improve compare_double function 2019-12-06 18:16:27 +08:00
Alanscut
1f970e7db3 fix double comparison 2019-12-06 17:11:12 +08:00