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,008 Commits 11 Branches 48 Tags 3.6 MiB
Commit Graph

1008 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Bernt Johan Damslora
26772a8ef7 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
randy408
dc56e24f7f add build script 2019-10-14 17:12:13 +02:00
Alanscut
f31ff795bd
Merge pull request #392 from Alanscut/fix-readme-typos 
Fix typos in REAM.md file
 2019-10-08 09:10:54 +08:00
Alanscut
e52b212dbf fix typos in REAM.md file 2019-09-29 19:06:47 +08:00
Alanscut
2de7d04aaf
Merge pull request #389 from DaveGamble/revert-388-secure_c 
Revert "Replace strcpy with strncpy, sprintf with snprintf"
 2019-09-24 10:20:41 +08:00
Alanscut
ae49da2b61
Revert "Replace strcpy with strncpy, sprintf with snprintf" 2019-09-21 17:42:25 +08:00
Alanscut
a3154a36f1
Merge pull request #388 from singku/secure_c 
Replace strcpy with strncpy, sprintf with snprintf
 2019-09-21 15:43:13 +08:00
Alanscut
189b51c5da format comment 2019-09-11 10:42:44 +08:00
Alanscut
709c3dcf32
Merge pull request #374 from Alanscut/20190625 
Add a comment to the parameter count of the cJSON_CreateIntArray function
 2019-09-11 09:53:19 +08:00
Alanscut
c61573f1af format adjustment 2019-09-11 09:51:30 +08:00
Alanscut
20cffa37a8
Merge pull request #380 from vemakereporter/master 
Fixed 1 missing dependency in Makefile
 2019-09-11 09:00:44 +08:00
Alanscut
cf0d87a095
Merge pull request #384 from Alanscut/eliminate_warning 
eliminate warning when compiling cJSON
 2019-08-28 20:57:02 +08:00
Alanscut
e750194cb1
Merge pull request #386 from lntuition/master 
Correct typo error in cJSON.h
 2019-08-28 20:56:06 +08:00
Alanscut
e13f11ba79
Merge pull request #360 from Alanscut/master 
add comment for cJSON_Minify function
 2019-08-27 14:50:48 +08:00
Alanscut
8872b1429a
Merge pull request #371 from basanjeev/master 
Fix typos.
 2019-08-26 16:33:05 +08:00
Randy
bd1a375028 add fuzzer driver, integrate with build system 2019-08-24 17:42:48 +02:00
Sang-Heon Jeon
b6da0d6565
Correct typo error 2019-08-24 22:43:33 +09:00
Alanscut
166c814cda eliminate warning when compiling cJSON 2019-08-12 17:06:29 +08:00
Vemake
c680faea56
Update Makefile 2019-07-24 20:46:41 +08:00
Randy
2d6db59c7b update fuzzer 2019-07-11 15:09:10 +02:00
Randy
e6bc5d16e6 update fuzzer 2019-07-11 15:03:04 +02:00
Randy
2691e142f4 update fuzzer 2019-07-11 14:42:27 +02:00
Randy
f7f175fdf2 add fuzz target 2019-07-11 13:56:07 +02:00
Alanscut
9d766f07a7 fix const cast warnings in cJSON_GetStringValue 2019-06-28 14:22:02 +08:00
Alanscut
85ceadb4b4 Add a comment to the parameter count of the cJSON_CreateIntArray function. 2019-06-25 17:25:23 +08:00
Sanjeev BA
110f184d18 Fix typos. 
Signed-off-by: Sanjeev BA <iamsanjeev@gmail.com>
 2019-06-16 07:58:03 +09:00
Paweł Malowany
c9e8a68b00 Fix clang -Wfloat-equal warning 2019-06-10 11:37:03 +02:00
singku
16f56300e4 Replace strcpy with strncpy, sprintf with snprintf 2019-05-29 21:25:33 +00:00
Alan_scut
5fe80a94b6 add comment for cJSON_Minify function 2019-05-22 10:24:13 +08:00
Max Bruckner
3c8935676a
Merge pull request #355 from DaveGamble/release-1.7.12 
Release 1.7.12
v1.7.12 		2019-05-17 01:05:59 +02:00
Max Bruckner
b93fd34044 Update changelog and contributors 2019-05-17 00:37:26 +02:00
Max Bruckner
687b1a2fe1 Update version to 1.7.12 2019-05-16 20:03:12 +02:00
Max Bruckner
08d2bc766a Fix infinite loop in cJSON_Minify 2019-05-16 20:01:02 +02:00
Max Bruckner
465352fb99
Merge pull request #352 from tan-wei/master 
Add link dependency to fix tests link error when ENABLE_CJSON_UTILS is ON
 2019-05-11 12:06:26 +02:00
Winterreise
19ff92da79 Add link dependency to fix tests link error when ENABLE_CJSON_UTILS is ON 2019-05-11 07:37:33 +08:00
Simon Sobisch
3a4cfa84c3
allow to override PIC_FLAGS and compiler std 2019-05-06 21:07:06 +02:00
Max Bruckner
62bc2e3432
Merge pull request #347 from raiden00pl/master 
Undef true and false first also for cJSON_Utils.c
 2019-04-28 13:31:46 +02:00
raiden00pl
359567fdde Undef true and false first also for cJSON_Utils.c 2019-04-28 10:33:44 +02:00
Max Bruckner
0b5a7abf48
Merge pull request #340 from ldm0/master 
Typo Fix
 2019-04-15 23:06:11 +02:00
Max Bruckner
93688cbe72
Merge pull request #344 from DaveGamble/release-1.7.11 
Release 1.7.11
v1.7.11 		2019-04-15 00:17:19 +02:00
Max Bruckner
6b249213dd Fix clang -Wcomma warning 2019-04-15 00:06:35 +02:00