mirror/cJSON
1
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2023-08-10 21:13:26 +03:00
Code Issues Projects Releases Wiki Activity
1,074 Commits 11 Branches 46 Tags
9e7ca4821fb5757dfb5504cbcd3b5704ae0cf147
Commit Graph

1074 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
filzek
9e7ca4821f ESP32 allocate memory from external or internal 
Hi,

Currently on heavy or most used memory needed applications we need to allocate the memopry need to cJSON in external memory.

It is extremely necessary to patch the files to let us choose from which memory we want to use the memory from, in this case, using the heap_caps_malloc, heap_caps_realloc or heap_caps_calloc function with the flag  MALLOC_CAP_INTERNAL, MALLOC_CAP_DEFAULT or MALLOC_CAP_SPIRAM, or can have all the flags to be used on allocation.

Its could be a simple implement when look at the cJSON.c at internal_malloc and internal_realloc so, the return of allocation could be used!
 2023-01-23 23:20:09 -03:00
Junbo Zheng
b45f48e600 fix: add allocate check for replace_item_in_object (#675) 
Signed-off-by: Junbo Zheng <zhengjunbo1@xiaomi.com>
 2022-03-29 15:02:59 +08:00
Stoian Ivanov
a6424b85dd feat: add cJSON_SetBoolValue and test (#639) 
* cJSON_SetBoolValue plus test

* cJSON_Invalid insted of just 0

* Update tests/misc_tests.c

* VSCode standard C formater applied

Co-authored-by: Alan Wang <wp_scut@163.com>
 2022-01-26 20:24:50 +08:00
mohawk2
3cecc40466 docs: Fix README typo (#664) 2022-01-26 20:23:33 +08:00
Randy
2fc55f6793 chore: add CIFuzz integration (#437) 
* CIFuzz integration

* Rename main.yml to ci-fuzz.yml
 2022-01-20 14:23:57 +08:00
Tony Langhammer
c7025b093a chore: ignore all .dylib files (#628) 
This fixes some .dylib files being flagged as added when compiled e.g. `libcjson.dylib.1.7.14`
 2022-01-20 14:17:46 +08:00
10km
e7ebe77ebf fix: 'cjson_utils-static' target not exist(#625) 
* Update CMakeLists.txt

fix the bug:when build with cmake using option '-DBUILD_SHARED_AND_STATIC_LIBS=ON -DENABLE_CJSON_UTILS=ON', build sucess,
but use cmake comand 'find_package(cjson CONFIG)', 'cjson_utils' target is available,but  'cjson_utils-static' target not exist.
 2022-01-19 16:28:29 +08:00
Andy
61eb84d991 add an option for ENABLE_CJSON_VERSION_SO in CMakeLists.txt (#534) 
Co-authored-by: m00209177 <malihu@huawei.com>
 2022-01-19 14:45:02 +08:00
AlexanderVasiljev
d321fa9e6e fix: print int without decimal places (#630) 2022-01-19 10:30:31 +08:00
Alan Wang
203a0dec6f chore: ignore *.lst/*.lss file (#623) 2021-10-22 16:21:55 +08:00
Joshua Arulsamy
c77a688927 build: Bump cmake version and use new version syntax (#587) 
Co-authored-by: Alan Wang <wp_scut@163.com>
 2021-10-22 16:15:19 +08:00
Alan Wang
e5dbaee131 docs: update comment (#622) 2021-10-22 16:09:45 +08:00
SuperHuan
189dcde644 fix: add cmake_policy to CMakeLists.txt (#613) 
Use the cmake_policy() command to set CMP0054 to NEW explicitly.
 2021-10-22 16:02:06 +08:00
Sayan Bandyopadhyay
b9eff8b02a fix: for issue #569, now use the guard to turn it off (#617) 2021-10-22 15:57:05 +08:00
Alan Wang
f50dafc7d0 fix: potential memory leak in merge_patch() (#611) 2021-08-26 14:13:42 +08:00
Alan Wang
d348621ca9 chore: update version and changelog (#610) v1.7.15 2021-08-25 19:15:09 +08:00
Alan Wang
744e47353a fix: remove redundant condition (#605) 2021-08-25 15:02:00 +08:00
Dimitri Papadopoulos Orfanos
7795249dd4 Typos found by codespell (#607) 2021-08-25 15:01:12 +08:00
CoffeeTableEspresso
324a6ac9a9 Update .gitattributes (#544) 2020-12-31 10:38:10 +08:00
Alan Wang
6ea4c01e4e Fix potential core dumped for strrchr (#546) 2020-12-31 10:26:39 +08:00
Jordan IMBERT
9226e4ed8c Remove always true condition in cJSON.c (#539) 2020-12-17 17:07:18 +08:00
Alan Wang
7b6645794d Fix null pointer crash, closes #536 (#538) 2020-12-17 15:42:31 +08:00
Tim Gates
4100379a04 docs: fix simple typo, transfering -> transferring (#527) 
There is a small typo in tests/readme_examples.c.

Should read `transferring` rather than `transfering`.
 2020-11-16 08:57:02 +08:00
mongobaba
2f6fc7f0f2 fix several null pointer problems on allocation failure (#526) 2020-11-12 11:46:15 +08:00
Alan Wang
a1e1c208ff Merge pull request #519 from Alanscut/issue-516 
fix a possible dereference of null pointer
 2020-10-16 17:12:54 +08:00
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