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

1049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alanscut
98ecc0245a revert R_CFLAGS 2019-12-06 15:32:45 +08:00
Alanscut
6434d8643e
Merge pull request #368 from paulmalovanyi/master 
Fix clang -Wfloat-equal warning
 2019-12-06 15:18:55 +08:00
Alanscut
51f6b4c07e
Merge branch 'master' into master 2019-12-06 15:14:26 +08:00
Alanscut
d31fdefa38
Merge pull request #412 from Alanscut/fix_issue_327 
fix issue#327
 2019-12-06 14:43:58 +08:00
Alanscut
8badd19b64
Merge pull request #415 from Alanscut/fix_issue_414 
fix memory leak mentioned in issue 414
 2019-12-05 11:13:20 +08:00
Alanscut
500a9db81b fix memory leak mentioned in issue 414 2019-12-05 11:05:07 +08:00
Alanscut
95368da1a1
Merge pull request #413 from erez-o/master 
Added blank lines in Readme.md
 2019-11-29 11:04:49 +08:00
Erez Oxman
f3b6ad15f0
Added blank lines in Readme.md 
Added blank lines before list items and headings. This change creates consistency between different markdown parsers. There's no difference in the output of Github flavored markdown.

See https://babelmark.github.io/
 2019-11-28 14:15:44 +02:00
Alanscut
446ff0d6cc fix issue#327 2019-11-28 09:56:04 +08:00
Alanscut
6a848fce32
Merge pull request #408 from rolegic/patch-api-h-c 
Fixed different argument between declaration and definition
 2019-11-19 10:51:13 +08:00
rolegic
c64854b26e Fixed different argument between declaration and definition 2019-11-15 15:43:43 +01:00
Alanscut
533ff8a783
Merge pull request #405 from Alanscut/issue-404 
fix make failed in mac os
 2019-11-02 22:38:33 +08:00
Alanscut
4755aea837 fix make failed in mac os 2019-11-01 11:30:14 +08:00
Alanscut
4454731775 update readme 2019-10-29 16:14:22 +08:00
Alanscut
326f1f5ed5
Merge pull request #402 from Alanscut/cmake_add_uninstall_target 
CMake: add uninstall target
 2019-10-29 16:09:32 +08:00
Alanscut
bb059dc2e1 add uninstall target in cmake 2019-10-29 15:48:11 +08:00
Alanscut
de99175cd0
fix rmdir error (#401) 
* fix rmdir error
 2019-10-29 14:21:16 +08:00
Alanscut
a417b183c6 add new line to endif 2019-10-29 12:47:36 +08:00
Alanscut
f589f81a42
Merge pull request #400 from randy408/fuzz 
OSS-Fuzz: build with $CXX
 2019-10-22 21:07:52 +08:00
Randy
49a0ede475 ossfuzz: build with c++ compiler 2019-10-22 13:37:41 +02:00
Randy
73b0e739d0 fuzz: add support for compiling with c++ compiler 2019-10-22 13:32:41 +02:00
Alanscut
a0fdf115be
Merge pull request #398 from randy408/fuzz 
ossfuzz.sh: fix permission bits
 2019-10-22 18:48:47 +08:00
Randy
6b728982f2 ossfuzz.sh: fix permission bits 2019-10-22 12:45:13 +02:00
Alanscut
f00060af44
Merge pull request #378 from randy408/fuzz 
Add libFuzzer fuzz target / OSS-Fuzz integration
 2019-10-22 11:22:30 +08:00
randy408
ec8d2f9c2e convert fuzz target to c89, optimize 2019-10-21 15:27:47 +02:00
Alanscut
18b7113b49
Merge pull request #351 from GitMensch/patch-1 
allow to override PIC_FLAGS and compiler std
 2019-10-21 17:06:14 +08:00
Alanscut
18dad60035
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
66d0a1793f
Merge pull request #395 from bjda/more_const 
Add const qualifier to cJSON_CreateStringArray
 2019-10-20 22:46:05 +08:00
Alanscut
a8dbf6d878
Merge pull request #343 from myd7349/fix-install-path 
CMake: Improve install target
 2019-10-19 22:57:48 +08:00
Alanscut
60fb788aa5
Merge pull request #396 from julian-st/master 
initialize variables in print_number
 2019-10-19 22:23:45 +08:00
Julian Ste
bcc91ecbc3
initilize variables in print_number 2019-10-19 13:53:21 +02:00