]> git.feebdaed.xyz Git - 0xmirror/cJSON.git/log
0xmirror/cJSON.git
5 years agoRemove unnecessary files in release tarball
h00283522 [Fri, 26 Jun 2020 02:37:00 +0000 (10:37 +0800)]
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>
5 years agocorrect mistake
Alanscut [Thu, 16 Jan 2020 09:10:52 +0000 (17:10 +0800)]
correct mistake

6 years agoMerge pull request #418 from Alanscut/update_Changelog
Alanscut [Tue, 10 Dec 2019 09:38:45 +0000 (17:38 +0800)]
Merge pull request #418 from Alanscut/update_Changelog

update CHANGELOG

6 years agoupdate CHANGELOG.md
Alanscut [Fri, 29 Nov 2019 08:10:41 +0000 (16:10 +0800)]
update CHANGELOG.md

6 years agoimprove compare_double
Alanscut [Mon, 9 Dec 2019 02:36:45 +0000 (10:36 +0800)]
improve compare_double

6 years agoMerge pull request #417 from zjuchenyuan/patch-1
Alanscut [Mon, 9 Dec 2019 00:54:55 +0000 (08:54 +0800)]
Merge pull request #417 from zjuchenyuan/patch-1

Update cJSON_Utils.c to avoid ‘CJSON_DOUBLE_PRECIION’ undeclared

6 years agoUpdate cJSON_Utils.c
ChenYuan [Sat, 7 Dec 2019 12:24:07 +0000 (20:24 +0800)]
Update cJSON_Utils.c

fix typo

6 years agoimprove compare_double function
Alanscut [Fri, 6 Dec 2019 10:16:27 +0000 (18:16 +0800)]
improve compare_double function

6 years agofix double comparison
Alanscut [Fri, 6 Dec 2019 09:11:12 +0000 (17:11 +0800)]
fix double comparison

6 years agorevert R_CFLAGS
Alanscut [Fri, 6 Dec 2019 07:32:45 +0000 (15:32 +0800)]
revert R_CFLAGS

6 years agoMerge pull request #368 from paulmalovanyi/master
Alanscut [Fri, 6 Dec 2019 07:18:55 +0000 (15:18 +0800)]
Merge pull request #368 from paulmalovanyi/master

Fix clang -Wfloat-equal warning

6 years agoMerge branch 'master' into master
Alanscut [Fri, 6 Dec 2019 07:14:26 +0000 (15:14 +0800)]
Merge branch 'master' into master

6 years agoMerge pull request #412 from Alanscut/fix_issue_327
Alanscut [Fri, 6 Dec 2019 06:43:58 +0000 (14:43 +0800)]
Merge pull request #412 from Alanscut/fix_issue_327

fix issue#327

6 years agoMerge pull request #415 from Alanscut/fix_issue_414
Alanscut [Thu, 5 Dec 2019 03:13:20 +0000 (11:13 +0800)]
Merge pull request #415 from Alanscut/fix_issue_414

fix memory leak mentioned in issue 414

6 years agofix memory leak mentioned in issue 414
Alanscut [Thu, 5 Dec 2019 03:05:07 +0000 (11:05 +0800)]
fix memory leak mentioned in issue 414

6 years agoMerge pull request #413 from erez-o/master
Alanscut [Fri, 29 Nov 2019 03:04:49 +0000 (11:04 +0800)]
Merge pull request #413 from erez-o/master

Added blank lines in Readme.md

6 years agoAdded blank lines in Readme.md
Erez Oxman [Thu, 28 Nov 2019 12:15:44 +0000 (14:15 +0200)]
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/

6 years agofix issue#327
Alanscut [Wed, 27 Nov 2019 03:08:35 +0000 (11:08 +0800)]
fix issue#327

6 years agoMerge pull request #408 from rolegic/patch-api-h-c
Alanscut [Tue, 19 Nov 2019 02:51:13 +0000 (10:51 +0800)]
Merge pull request #408 from rolegic/patch-api-h-c

Fixed different argument between declaration and definition

6 years agoFixed different argument between declaration and definition
rolegic [Fri, 15 Nov 2019 14:43:43 +0000 (15:43 +0100)]
Fixed different argument between declaration and definition

6 years agoMerge pull request #405 from Alanscut/issue-404
Alanscut [Sat, 2 Nov 2019 14:38:33 +0000 (22:38 +0800)]
Merge pull request #405 from Alanscut/issue-404

fix make failed in mac os

6 years agofix make failed in mac os
Alanscut [Fri, 1 Nov 2019 03:30:14 +0000 (11:30 +0800)]
fix make failed in mac os

6 years agoupdate readme
Alanscut [Tue, 29 Oct 2019 08:14:22 +0000 (16:14 +0800)]
update readme

6 years agoMerge pull request #402 from Alanscut/cmake_add_uninstall_target
Alanscut [Tue, 29 Oct 2019 08:09:32 +0000 (16:09 +0800)]
Merge pull request #402 from Alanscut/cmake_add_uninstall_target

CMake: add uninstall target

6 years agoadd uninstall target in cmake
Alanscut [Tue, 29 Oct 2019 07:48:11 +0000 (15:48 +0800)]
add uninstall target in cmake

6 years agofix rmdir error (#401)
Alanscut [Tue, 29 Oct 2019 06:21:16 +0000 (14:21 +0800)]
fix rmdir error (#401)

* fix rmdir error

6 years agoadd new line to endif
Alanscut [Tue, 29 Oct 2019 04:47:36 +0000 (12:47 +0800)]
add new line to endif

6 years agoMerge pull request #400 from randy408/fuzz
Alanscut [Tue, 22 Oct 2019 13:07:52 +0000 (21:07 +0800)]
Merge pull request #400 from randy408/fuzz

OSS-Fuzz: build with $CXX

6 years agoossfuzz: build with c++ compiler
Randy [Tue, 22 Oct 2019 11:37:41 +0000 (13:37 +0200)]
ossfuzz: build with c++ compiler

6 years agofuzz: add support for compiling with c++ compiler
Randy [Tue, 22 Oct 2019 11:32:41 +0000 (13:32 +0200)]
fuzz: add support for compiling with c++ compiler

6 years agoMerge pull request #398 from randy408/fuzz
Alanscut [Tue, 22 Oct 2019 10:48:47 +0000 (18:48 +0800)]
Merge pull request #398 from randy408/fuzz

ossfuzz.sh: fix permission bits

6 years agoossfuzz.sh: fix permission bits
Randy [Tue, 22 Oct 2019 10:45:13 +0000 (12:45 +0200)]
ossfuzz.sh: fix permission bits

6 years agoMerge pull request #378 from randy408/fuzz
Alanscut [Tue, 22 Oct 2019 03:22:30 +0000 (11:22 +0800)]
Merge pull request #378 from randy408/fuzz

Add libFuzzer fuzz target / OSS-Fuzz integration

6 years agoconvert fuzz target to c89, optimize
randy408 [Mon, 21 Oct 2019 13:27:47 +0000 (15:27 +0200)]
convert fuzz target to c89, optimize

6 years agoMerge pull request #351 from GitMensch/patch-1
Alanscut [Mon, 21 Oct 2019 09:06:14 +0000 (17:06 +0800)]
Merge pull request #351 from GitMensch/patch-1

allow to override PIC_FLAGS and compiler std

6 years agoMerge pull request #377 from Alanscut/20190628
Alanscut [Sun, 20 Oct 2019 14:47:11 +0000 (22:47 +0800)]
Merge pull request #377 from Alanscut/20190628

fix bug: add const to the parameter in the cJSON_GetStringValue function

6 years agoMerge pull request #395 from bjda/more_const
Alanscut [Sun, 20 Oct 2019 14:46:05 +0000 (22:46 +0800)]
Merge pull request #395 from bjda/more_const

Add const qualifier to cJSON_CreateStringArray

6 years agoMerge pull request #343 from myd7349/fix-install-path
Alanscut [Sat, 19 Oct 2019 14:57:48 +0000 (22:57 +0800)]
Merge pull request #343 from myd7349/fix-install-path

CMake: Improve install target

6 years agoMerge pull request #396 from julian-st/master
Alanscut [Sat, 19 Oct 2019 14:23:45 +0000 (22:23 +0800)]
Merge pull request #396 from julian-st/master

initialize variables in print_number

6 years agoinitilize variables in print_number
Julian Ste [Sat, 19 Oct 2019 11:53:21 +0000 (13:53 +0200)]
initilize variables in print_number

6 years agoAdd const qualifier to cJSON_CreateStringArray
Bernt Johan Damslora [Thu, 17 Oct 2019 12:03:15 +0000 (14:03 +0200)]
Add const qualifier to cJSON_CreateStringArray

Adds a const qualifier to the strings in the array to avoid discarding
it from arguments.

6 years agoadd build script
randy408 [Mon, 14 Oct 2019 15:12:13 +0000 (17:12 +0200)]
add build script

6 years agoMerge pull request #392 from Alanscut/fix-readme-typos
Alanscut [Tue, 8 Oct 2019 01:10:54 +0000 (09:10 +0800)]
Merge pull request #392 from Alanscut/fix-readme-typos

Fix typos in REAM.md file

6 years agofix typos in REAM.md file
Alanscut [Sun, 29 Sep 2019 10:53:21 +0000 (18:53 +0800)]
fix typos in REAM.md file

6 years agoMerge pull request #389 from DaveGamble/revert-388-secure_c
Alanscut [Tue, 24 Sep 2019 02:20:41 +0000 (10:20 +0800)]
Merge pull request #389 from DaveGamble/revert-388-secure_c

Revert "Replace strcpy with strncpy, sprintf with snprintf"

6 years agoRevert "Replace strcpy with strncpy, sprintf with snprintf"
Alanscut [Sat, 21 Sep 2019 09:42:25 +0000 (17:42 +0800)]
Revert "Replace strcpy with strncpy, sprintf with snprintf"

6 years agoMerge pull request #388 from singku/secure_c
Alanscut [Sat, 21 Sep 2019 07:43:13 +0000 (15:43 +0800)]
Merge pull request #388 from singku/secure_c

Replace strcpy with strncpy, sprintf with snprintf

6 years agoformat comment
Alanscut [Wed, 11 Sep 2019 02:42:44 +0000 (10:42 +0800)]
format comment

6 years agoMerge pull request #374 from Alanscut/20190625
Alanscut [Wed, 11 Sep 2019 01:53:19 +0000 (09:53 +0800)]
Merge pull request #374 from Alanscut/20190625

Add a comment to the parameter count of the cJSON_CreateIntArray function

6 years agoformat adjustment
Alanscut [Wed, 11 Sep 2019 01:51:30 +0000 (09:51 +0800)]
format adjustment

6 years agoMerge pull request #380 from vemakereporter/master
Alanscut [Wed, 11 Sep 2019 01:00:44 +0000 (09:00 +0800)]
Merge pull request #380 from vemakereporter/master

Fixed 1 missing dependency in Makefile

6 years agoMerge pull request #384 from Alanscut/eliminate_warning
Alanscut [Wed, 28 Aug 2019 12:57:02 +0000 (20:57 +0800)]
Merge pull request #384 from Alanscut/eliminate_warning

eliminate warning when compiling cJSON

6 years agoMerge pull request #386 from lntuition/master
Alanscut [Wed, 28 Aug 2019 12:56:06 +0000 (20:56 +0800)]
Merge pull request #386 from lntuition/master

Correct typo error in cJSON.h

6 years agoMerge pull request #360 from Alanscut/master
Alanscut [Tue, 27 Aug 2019 06:50:48 +0000 (14:50 +0800)]
Merge pull request #360 from Alanscut/master

add comment for cJSON_Minify function

6 years agoMerge pull request #371 from basanjeev/master
Alanscut [Mon, 26 Aug 2019 08:33:05 +0000 (16:33 +0800)]
Merge pull request #371 from basanjeev/master

Fix typos.

6 years agoadd fuzzer driver, integrate with build system
Randy [Sat, 24 Aug 2019 15:42:48 +0000 (17:42 +0200)]
add fuzzer driver, integrate with build system

6 years agoCorrect typo error
Sang-Heon Jeon [Sat, 24 Aug 2019 13:43:33 +0000 (22:43 +0900)]
Correct typo error

6 years agoeliminate warning when compiling cJSON
Alanscut [Mon, 12 Aug 2019 09:06:29 +0000 (17:06 +0800)]
eliminate warning when compiling cJSON

6 years agoUpdate Makefile
Vemake [Wed, 24 Jul 2019 12:46:41 +0000 (20:46 +0800)]
Update Makefile

6 years agoupdate fuzzer
Randy [Thu, 11 Jul 2019 13:09:10 +0000 (15:09 +0200)]
update fuzzer

6 years agoupdate fuzzer
Randy [Thu, 11 Jul 2019 13:03:04 +0000 (15:03 +0200)]
update fuzzer

6 years agoupdate fuzzer
Randy [Thu, 11 Jul 2019 12:42:27 +0000 (14:42 +0200)]
update fuzzer

6 years agoadd fuzz target
Randy [Thu, 11 Jul 2019 11:56:07 +0000 (13:56 +0200)]
add fuzz target

6 years agofix const cast warnings in cJSON_GetStringValue
Alanscut [Fri, 28 Jun 2019 06:22:02 +0000 (14:22 +0800)]
fix const cast warnings in cJSON_GetStringValue

6 years agoAdd a comment to the parameter count of the cJSON_CreateIntArray function.
Alanscut [Tue, 25 Jun 2019 09:25:23 +0000 (17:25 +0800)]
Add a comment to the parameter count of the cJSON_CreateIntArray function.

6 years agoFix typos.
Sanjeev BA [Sat, 15 Jun 2019 22:58:03 +0000 (07:58 +0900)]
Fix typos.

Signed-off-by: Sanjeev BA <iamsanjeev@gmail.com>
6 years agoFix clang -Wfloat-equal warning
Paweł Malowany [Mon, 10 Jun 2019 08:59:31 +0000 (10:59 +0200)]
Fix clang -Wfloat-equal warning

6 years agoReplace strcpy with strncpy, sprintf with snprintf
singku [Wed, 29 May 2019 21:25:33 +0000 (21:25 +0000)]
Replace strcpy with strncpy, sprintf with snprintf

6 years agoadd comment for cJSON_Minify function
Alan_scut [Wed, 22 May 2019 02:24:13 +0000 (10:24 +0800)]
add comment for cJSON_Minify function

6 years agoMerge pull request #355 from DaveGamble/release-1.7.12
Max Bruckner [Thu, 16 May 2019 23:05:59 +0000 (01:05 +0200)]
Merge pull request #355 from DaveGamble/release-1.7.12

Release 1.7.12

6 years agoUpdate changelog and contributors
Max Bruckner [Thu, 16 May 2019 22:37:26 +0000 (00:37 +0200)]
Update changelog and contributors

6 years agoUpdate version to 1.7.12
Max Bruckner [Thu, 16 May 2019 18:03:12 +0000 (20:03 +0200)]
Update version to 1.7.12

6 years agoFix infinite loop in cJSON_Minify
Max Bruckner [Thu, 16 May 2019 18:01:02 +0000 (20:01 +0200)]
Fix infinite loop in cJSON_Minify

6 years agoMerge pull request #352 from tan-wei/master
Max Bruckner [Sat, 11 May 2019 10:06:26 +0000 (12:06 +0200)]
Merge pull request #352 from tan-wei/master

Add link dependency to fix tests link error when ENABLE_CJSON_UTILS is ON

6 years agoAdd link dependency to fix tests link error when ENABLE_CJSON_UTILS is ON
Winterreise [Fri, 10 May 2019 23:37:33 +0000 (07:37 +0800)]
Add link dependency to fix tests link error when ENABLE_CJSON_UTILS is ON

6 years agoallow to override PIC_FLAGS and compiler std
Simon Sobisch [Mon, 6 May 2019 19:07:06 +0000 (21:07 +0200)]
allow to override PIC_FLAGS and compiler std

6 years agoMerge pull request #347 from raiden00pl/master
Max Bruckner [Sun, 28 Apr 2019 11:31:46 +0000 (13:31 +0200)]
Merge pull request #347 from raiden00pl/master

Undef true and false first also for cJSON_Utils.c

6 years agoUndef true and false first also for cJSON_Utils.c
raiden00pl [Sun, 28 Apr 2019 08:33:44 +0000 (10:33 +0200)]
Undef true and false first also for cJSON_Utils.c

6 years agoMerge pull request #340 from ldm0/master
Max Bruckner [Mon, 15 Apr 2019 21:06:11 +0000 (23:06 +0200)]
Merge pull request #340 from ldm0/master

Typo Fix

6 years agoMerge pull request #344 from DaveGamble/release-1.7.11
Max Bruckner [Sun, 14 Apr 2019 22:17:19 +0000 (00:17 +0200)]
Merge pull request #344 from DaveGamble/release-1.7.11

Release 1.7.11

6 years agoFix clang -Wcomma warning
Max Bruckner [Sun, 14 Apr 2019 22:06:35 +0000 (00:06 +0200)]
Fix clang -Wcomma warning

6 years agoRelease cJSON 1.7.11
Max Bruckner [Sun, 14 Apr 2019 21:58:02 +0000 (23:58 +0200)]
Release cJSON 1.7.11

6 years agoRewrite cJSON_Minify, fixing buffer overflows, fixes #338
Max Bruckner [Sun, 14 Apr 2019 21:13:41 +0000 (23:13 +0200)]
Rewrite cJSON_Minify, fixing buffer overflows, fixes #338

Also first tests for cJSON_Minify.
Thanks @bigric3 for reporting

6 years agoCMake: Improve install target
myd7349 [Sun, 14 Apr 2019 11:41:28 +0000 (19:41 +0800)]
CMake: Improve install target

6 years agoUndef true and false first, fixes #339
Max Bruckner [Fri, 12 Apr 2019 23:44:23 +0000 (01:44 +0200)]
Undef true and false first, fixes #339

Thanks  @raiden00pl for reporting

6 years agoUpdate cJSON.c
Donough Liu [Mon, 18 Mar 2019 14:56:34 +0000 (22:56 +0800)]
Update cJSON.c

7 years agoRelease Version 1.7.10
Max Bruckner [Thu, 20 Dec 2018 17:15:05 +0000 (18:15 +0100)]
Release Version 1.7.10

7 years agocJSON_Utils: sort_lists: Properly split the lists
Max Bruckner [Thu, 20 Dec 2018 17:12:23 +0000 (18:12 +0100)]
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!

7 years agolibcjson.pc.in: Use Libs.private instead of Private
Max Bruckner [Thu, 20 Dec 2018 17:04:52 +0000 (18:04 +0100)]
libcjson.pc.in: Use Libs.private instead of Private

Thanks @shiluotang

7 years agoAdd missing changelog entry
Max Bruckner [Sun, 16 Dec 2018 10:21:35 +0000 (11:21 +0100)]
Add missing changelog entry

7 years agoRelease Version 1.7.9
Max Bruckner [Sun, 16 Dec 2018 10:17:20 +0000 (11:17 +0100)]
Release Version 1.7.9

7 years agoAdd yuta-oxo to the Contributors
Max Bruckner [Sun, 16 Dec 2018 10:16:31 +0000 (11:16 +0100)]
Add yuta-oxo to the Contributors

7 years agoMerge pull request #317 from yuta-oxo/fix_sort_list
Max Bruckner [Sun, 16 Dec 2018 10:10:06 +0000 (11:10 +0100)]
Merge pull request #317 from yuta-oxo/fix_sort_list

fix bug: sort_list() returns strange results

7 years agoFix crash of cJSON_GetObjectItemCaseSensitive when calling it on arrays
Max Bruckner [Sun, 16 Dec 2018 10:06:40 +0000 (11:06 +0100)]
Fix crash of cJSON_GetObjectItemCaseSensitive when calling it on arrays

7 years agofix bug: sort_list() returns strange results
yuta-oxo [Wed, 12 Dec 2018 06:09:53 +0000 (15:09 +0900)]
fix bug: sort_list() returns strange results

7 years agoREADME: Add note about needing to free print results in examples
Max Bruckner [Mon, 3 Dec 2018 22:07:36 +0000 (23:07 +0100)]
README: Add note about needing to free print results in examples

7 years agoGitignore: Ignore CLion directories
Max Bruckner [Sun, 14 Oct 2018 09:52:41 +0000 (11:52 +0200)]
Gitignore: Ignore CLion directories

7 years agoMakefile: Fix indentation
Max Bruckner [Sun, 14 Oct 2018 09:52:19 +0000 (11:52 +0200)]
Makefile: Fix indentation

7 years agoAdd .editorconfig
Max Bruckner [Sun, 14 Oct 2018 09:51:56 +0000 (11:51 +0200)]
Add .editorconfig

7 years agoAdd Benbuck Nason to the list of contributors
Max Bruckner [Sun, 14 Oct 2018 09:22:14 +0000 (11:22 +0200)]
Add Benbuck Nason to the list of contributors