1077 Commits

Author SHA1 Message Date
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
Max Bruckner
09ebae8149 Release cJSON 1.7.11 2019-04-14 23:58:02 +02:00
Max Bruckner
a43fa56a63 Rewrite cJSON_Minify, fixing buffer overflows, fixes #338
Also first tests for cJSON_Minify.
Thanks @bigric3 for reporting
2019-04-14 23:18:48 +02:00
myd7349
9a970b9ff6 CMake: Improve install target 2019-04-14 19:41:28 +08:00
Max Bruckner
5a52eaddfd Undef true and false first, fixes #339
Thanks  @raiden00pl for reporting
2019-04-13 01:44:23 +02:00
Donough Liu
add86a6be8 Update cJSON.c 2019-03-18 22:56:34 +08:00
Max Bruckner
c69134d017 Release Version 1.7.10 v1.7.10 2018-12-20 18:15:05 +01:00
Max Bruckner
563d861f92 cJSON_Utils: sort_lists: Properly split the lists
Since `prev` is not used anymore after that by the algorithm it should
have been fine anyways, still splitting it correctly in the first place
is probably a good idea.
Thanks @andysCaplin for the fix!
2018-12-20 18:12:23 +01:00
Max Bruckner
6820448db5 libcjson.pc.in: Use Libs.private instead of Private
Thanks @shiluotang
2018-12-20 18:04:52 +01:00
Max Bruckner
d44b594ab3 Add missing changelog entry 2018-12-16 11:21:35 +01:00
Max Bruckner
f110bd2e58 Release Version 1.7.9 v1.7.9 2018-12-16 11:17:20 +01:00
Max Bruckner
5cd1dabb30 Add yuta-oxo to the Contributors 2018-12-16 11:16:31 +01:00
Max Bruckner
d606cbbc64
Merge pull request #317 from yuta-oxo/fix_sort_list
fix bug: sort_list() returns strange results
2018-12-16 11:10:06 +01:00
Max Bruckner
be749d7efa Fix crash of cJSON_GetObjectItemCaseSensitive when calling it on arrays 2018-12-16 11:06:40 +01:00
yuta-oxo
eaec82c3c5 fix bug: sort_list() returns strange results 2018-12-12 15:09:53 +09:00
Max Bruckner
cb1df2f88c README: Add note about needing to free print results in examples 2018-12-03 23:07:36 +01:00
Max Bruckner
2c914c073d Gitignore: Ignore CLion directories 2018-10-14 11:52:41 +02:00
Max Bruckner
4917024741 Makefile: Fix indentation 2018-10-14 11:52:19 +02:00
Max Bruckner
a3fadd44d1 Add .editorconfig 2018-10-14 11:51:56 +02:00
Max Bruckner
feb05fb2fd Add Benbuck Nason to the list of contributors 2018-10-14 11:22:14 +02:00
Max Bruckner
26f38f4782
Merge pull request #307 from bnason-nf/vstudio_static_analyzer_warnings
Fix most of the issues reported by the Visual Studio code analysis tool
2018-10-14 11:17:34 +02:00
Benbuck Nason
8e742e4869 Fix most of the issues reported by the Visual Studio code analysis tool. 2018-10-12 14:29:59 -07:00
Max Bruckner
543ab5d08a Update json-patch-tests 2018-10-11 00:30:43 +02:00
Max Bruckner
e2162adeed Squashed 'tests/json-patch-tests/' changes from 99264bb..9ecd703
9ecd703 Merge pull request #39 from mr-mixas/test-absent-from-location-for-copy-and-move-ops
66817e7 test absent 'from' location for copy and move
09dee56 Fix anonymous test
8bae8ed Fix « test should pass - no error » test
855f2a4 Fix « test should pass despite (nested) rearrangement » test
53283fc Fix « test should pass despite rearrangement » test
ecf01e7 Fix « null value should be valid obj property » test
1586cdf Fix « Empty-string element » test

git-subtree-dir: tests/json-patch-tests
git-subtree-split: 9ecd703c08cda4864cd2d2fb580a513ec5740934
2018-10-11 00:30:43 +02:00
Max Bruckner
08103f048e Release version 1.7.8 v1.7.8 2018-09-21 19:29:42 +02:00
Max Bruckner
ace800e444 Update changelog for 1.7.8 2018-09-21 19:28:25 +02:00
Max Bruckner
00544a4a74 Contributors: Add Zach Hindes 2018-09-21 19:26:01 +02:00
Max Bruckner
3550a5553d
Merge pull request #295 from zhindes/master
Support default __stdcall calling convention (/Gz) on Windows
2018-09-21 19:23:31 +02:00
Zach Hindes
d9fe34bade Add newline to end of unity_setup.c 2018-09-17 09:10:20 -05:00
Zach Hindes
f25b8448e4 Support default __stdcall calling convention on tests as well 2018-09-12 15:32:30 -05:00
Zach Hindes
ad2cb5b7ea Enable build and test on Windows 2018-09-04 14:36:21 -05:00
Zach Hindes
f32703a7a1 Support default __stdcall calling convention (/Gz) on Windows 2018-08-29 16:25:46 -05:00