Commit Graph

981 Commits

Author SHA1 Message Date
1f970e7db3 fix double comparison 2019-12-06 17:11:12 +08:00
98ecc0245a revert R_CFLAGS 2019-12-06 15:32:45 +08:00
6434d8643e Merge pull request #368 from paulmalovanyi/master
Fix clang -Wfloat-equal warning
2019-12-06 15:18:55 +08:00
51f6b4c07e Merge branch 'master' into master 2019-12-06 15:14:26 +08:00
d31fdefa38 Merge pull request #412 from Alanscut/fix_issue_327
fix issue#327
2019-12-06 14:43:58 +08:00
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
500a9db81b fix memory leak mentioned in issue 414 2019-12-05 11:05:07 +08:00
95368da1a1 Merge pull request #413 from erez-o/master
Added blank lines in Readme.md
2019-11-29 11:04:49 +08:00
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
446ff0d6cc fix issue#327 2019-11-28 09:56:04 +08:00
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
c64854b26e Fixed different argument between declaration and definition 2019-11-15 15:43:43 +01:00
533ff8a783 Merge pull request #405 from Alanscut/issue-404
fix make failed in mac os
2019-11-02 22:38:33 +08:00
4755aea837 fix make failed in mac os 2019-11-01 11:30:14 +08:00
4454731775 update readme 2019-10-29 16:14:22 +08:00
326f1f5ed5 Merge pull request #402 from Alanscut/cmake_add_uninstall_target
CMake: add uninstall target
2019-10-29 16:09:32 +08:00
bb059dc2e1 add uninstall target in cmake 2019-10-29 15:48:11 +08:00
de99175cd0 fix rmdir error (#401)
* fix rmdir error
2019-10-29 14:21:16 +08:00
a417b183c6 add new line to endif 2019-10-29 12:47:36 +08:00
f589f81a42 Merge pull request #400 from randy408/fuzz
OSS-Fuzz: build with $CXX
2019-10-22 21:07:52 +08:00
49a0ede475 ossfuzz: build with c++ compiler 2019-10-22 13:37:41 +02:00
73b0e739d0 fuzz: add support for compiling with c++ compiler 2019-10-22 13:32:41 +02:00
a0fdf115be Merge pull request #398 from randy408/fuzz
ossfuzz.sh: fix permission bits
2019-10-22 18:48:47 +08:00
6b728982f2 ossfuzz.sh: fix permission bits 2019-10-22 12:45:13 +02:00
f00060af44 Merge pull request #378 from randy408/fuzz
Add libFuzzer fuzz target / OSS-Fuzz integration
2019-10-22 11:22:30 +08:00
ec8d2f9c2e convert fuzz target to c89, optimize 2019-10-21 15:27:47 +02:00
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
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
66d0a1793f Merge pull request #395 from bjda/more_const
Add const qualifier to cJSON_CreateStringArray
2019-10-20 22:46:05 +08:00
a8dbf6d878 Merge pull request #343 from myd7349/fix-install-path
CMake: Improve install target
2019-10-19 22:57:48 +08:00
60fb788aa5 Merge pull request #396 from julian-st/master
initialize variables in print_number
2019-10-19 22:23:45 +08:00
bcc91ecbc3 initilize variables in print_number 2019-10-19 13:53:21 +02:00
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
dc56e24f7f add build script 2019-10-14 17:12:13 +02:00
f31ff795bd Merge pull request #392 from Alanscut/fix-readme-typos
Fix typos in REAM.md file
2019-10-08 09:10:54 +08:00
e52b212dbf fix typos in REAM.md file 2019-09-29 19:06:47 +08:00
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
ae49da2b61 Revert "Replace strcpy with strncpy, sprintf with snprintf" 2019-09-21 17:42:25 +08:00
a3154a36f1 Merge pull request #388 from singku/secure_c
Replace strcpy with strncpy, sprintf with snprintf
2019-09-21 15:43:13 +08:00
189b51c5da format comment 2019-09-11 10:42:44 +08:00
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
c61573f1af format adjustment 2019-09-11 09:51:30 +08:00
20cffa37a8 Merge pull request #380 from vemakereporter/master
Fixed 1 missing dependency in Makefile
2019-09-11 09:00:44 +08:00
cf0d87a095 Merge pull request #384 from Alanscut/eliminate_warning
eliminate warning when compiling cJSON
2019-08-28 20:57:02 +08:00
e750194cb1 Merge pull request #386 from lntuition/master
Correct typo error in cJSON.h
2019-08-28 20:56:06 +08:00
e13f11ba79 Merge pull request #360 from Alanscut/master
add comment for cJSON_Minify function
2019-08-27 14:50:48 +08:00
8872b1429a Merge pull request #371 from basanjeev/master
Fix typos.
2019-08-26 16:33:05 +08:00
bd1a375028 add fuzzer driver, integrate with build system 2019-08-24 17:42:48 +02:00
b6da0d6565 Correct typo error 2019-08-24 22:43:33 +09:00
166c814cda eliminate warning when compiling cJSON 2019-08-12 17:06:29 +08:00