yangfl
fa00278f66
Remove trailing space
2017-11-04 21:19:15 +08:00
Max Bruckner
8412b1e2cd
README: fixup last commit
2017-11-04 13:42:20 +01:00
Max Bruckner
35907223e1
README: Explain including cJSON, fix #211
2017-11-04 13:39:58 +01:00
Max Bruckner
8a11f8ce17
Merge pull request #210 from yangfl/upstream
...
CMakeLists.txt: swap GNUInstallDirs and project
2017-11-04 13:30:59 +01:00
yangfl
df1c49dba1
CMakeLists.txt: swap GNUInstallDirs and project
2017-11-04 20:14:56 +08:00
Max Bruckner
c083421f40
Release version 1.6.0
2017-10-08 23:36:41 +02:00
Max Bruckner
96c33e5abb
ENABLE_LOCALES: Actually disable the include as well
2017-10-08 23:28:49 +02:00
Max Bruckner
f437767fa9
Contributors: Add Simon Ricaldone and Casperinous
2017-10-08 23:13:30 +02:00
Max Bruckner
c51a19be51
CONTRIBUTING.md: Fix '4 tabs' -> '4 spaces'
2017-10-08 22:05:19 +02:00
Max Bruckner
97d7347a6e
Merge branch 'develop'
2017-10-08 22:05:02 +02:00
Max Bruckner
28328a0b34
Merge pull request #203 from Casperinous/master
...
Fix for #202 issue.
2017-10-08 21:48:46 +02:00
casperinous
9b960fa870
Small indentation fix in order to follow the contribution rules.
2017-10-08 22:02:52 +03:00
casperinous
4f9e9dfc30
Fix for issue #202 , regarding the lack of implementation of the localeconv method in some SDK's.
...
A macro named `ENABLE_LOCALES` was added and an option with the same name too in the CMakeLists.txt
2017-10-08 21:55:58 +03:00
Max Bruckner
b7bfe1e91a
Squashed 'tests/unity/' changes from 3b69bea..60b13f0
...
60b13f0 Bump version in preparation of release.
f278c18 Fix bug #288 - invalid line numbers on partial name matches
bdd4cb1 Merge pull request #294 from jlindgren90/master
fcd4883 Fix compiler warning due to reusing symbol 'exp'.
05daf95 Update to match Ruby style guide
7b2ad10 Merge pull request #285 from dpostorivo/gt_lt_asserts
0547aab Merge pull request #291 from jlindgren90/master
2ae2bdb Make code C89-compliant.
dbdd168 Fix test link error.
0e7eb54 Rewrite UnityPrintFloat to match printf("%.6g").
a868b2e Merge pull request #286 from palaviv/fix-UNITY_OUTPUT_FLUSH
e56378e Add UNITY_OUTPUT_CHAR_HEADER_DECLARATION to fixture tests rakefile_helper.rb
ad37302 Add UNITY_OUTPUT_CHAR_HEADER_DECLARATION to tests rakefile_helper.rb
b3de931 Add UNITY_OUTPUT_CHAR_HEADER_DECLARATION to fixture tests Makefile defines
59182c4 Add UNITY_OUTPUT_CHAR_HEADER_DECLARATION to tests Makefile defines
a07d07c Allow specifying custom header declaration
c1bc32d - Generator will not change names by default - Fixed some style issues.
f2fdf1a Added Greater than and Less than asserts from other PR
git-subtree-dir: tests/unity
git-subtree-split: 60b13f0685246b009810aecbffafe17fb665d970
2017-09-12 18:30:07 +02:00
Max Bruckner
acf80470f8
Update Unity to version v2.4.2
...
Merge commit 'b7bfe1e91a0b55d72f849944d5a33b7962d7bf51' into develop
2017-09-12 18:30:07 +02:00
Max Bruckner
afd5d186b7
Release version 1.5.9
2017-09-08 13:54:24 +02:00
Max Bruckner
7456637793
CONTRIBUTORS.md: Add Robin Mallinson
2017-09-08 13:52:15 +02:00
Max Bruckner
d92754cd30
Add valgrind suppressions for ARMv7
2017-09-08 13:25:14 +02:00
Max Bruckner
e4980b65b9
Merge pull request #200 from rmallins/cJSON_ParseWithOpts_fix_ErrorPtr_behaviour
...
Fix error pointer behaviour of cJSON_ParseWithOpts()
2017-09-08 12:05:19 +02:00
rmallins
629c354390
Rewrite test for cJSON_ParseWithOpts() to expect non-null error
...
pointer in error case and change code to match new expectations.
2017-09-08 01:22:10 +01:00
rmallins
1b2236a9a6
Improve existing tests showing behaviour of Parse and ParseWithOpts functions.
2017-09-08 01:20:52 +01:00
Max Bruckner
1925d1bbe5
Release version 1.5.8
2017-08-21 11:06:10 +02:00
Max Bruckner
76b705576f
Makefile: Fix 'make test'
...
make test tried to execute the test for cJSON_Utils, which has been
ported to CUnity tests.
2017-08-21 10:58:49 +02:00
Max Bruckner
469a437e2a
Add valgrind suppressions for ARVMv7 ArchlinuxARM
2017-07-15 11:59:47 +02:00
Max Bruckner
7e2781a734
Merge pull request #187 from simon-p-r/appveyor
...
First commit of appveyor
2017-07-15 10:19:14 +02:00
simon-p-r
f0f3e55d48
fixed appveyor script
2017-07-15 09:06:10 +01:00
simon-p-r
2caa884f6a
removed x64 Visual Studio 9 2008 build
2017-07-15 09:03:13 +01:00
Max Bruckner
88d66c5da9
Release version 1.5.7
2017-07-12 23:13:14 +02:00
Max Bruckner
954d61e5e7
Fix #189 , ensure returns an invalid pointer
...
If realloc returns NULL, ensure didn't abort but returned
printbuffer.offset instead. If an attacker can control
printbuffer.offset and also make realloc fail at just the right moment,
this would make cJSON potentially write at an arbitrary memory address.
2017-07-12 23:02:31 +02:00
simon-p-r
c6f7f78cbb
added copy to powershell script
2017-07-10 10:50:55 +01:00
simon-p-r
824e1b2a99
patch for Visual Studio 9 2008 x64 failed builds
2017-07-10 10:38:21 +01:00
simon-p-r
dd980008f7
add appveyor
2017-07-09 22:31:21 +01:00
Max Bruckner
ecdff7837c
Merge pull request #185 from jwilk-forks/spelling
...
Fix typos in json.dict
2017-07-08 20:16:33 +02:00
Jakub Wilk
a3c2eba991
Fix typos in json.dict
2017-07-08 09:39:06 +02:00
Max Bruckner
bf0bc22a11
CMake: Add ENABLE_SAFE_STACK option
2017-07-05 10:49:32 +02:00
Max Bruckner
5baa77f86c
cJSON_Parse{,WithOpts}: Skip UTF-8 (Byte Order Marks)
2017-07-03 22:28:04 +02:00
Max Bruckner
b26e71f960
Merge pull request #181 from DaveGamble/msvc-fixes
...
MSVC compiler handling
2017-06-28 17:28:52 +02:00
Max Bruckner
7a2615c231
Fix: Check if __GNUCC__ is defined
...
This has been detected via MSVC's Warning C4668
2017-06-28 17:28:51 +02:00
Max Bruckner
e174831819
CMake: Add custom compiler flags for MSVC
2017-06-28 17:28:51 +02:00
Max Bruckner
ac368e9dfb
MSVC: Fix warning about assignment in condition
2017-06-28 17:28:51 +02:00
Max Bruckner
d1c2e2df4a
MSVC: workaround for C2322
2017-06-28 17:28:51 +02:00
Max Bruckner
04e27dc8c5
CMake: New option BUILD_SHARED_AND_STATIC_LIBS
2017-06-28 17:28:50 +02:00
Max Bruckner
0d675cb048
MSVC: Disable warning about single line comments in system headers
2017-06-28 17:28:50 +02:00
Max Bruckner
45e1278acb
tests/print_number: Add test with 17 digits of precision
2017-06-28 17:28:50 +02:00
Max Bruckner
217ab02612
cJSON_Utils: Guard gcc pragmas with a check for __GCC__
2017-06-28 17:28:50 +02:00
Max Bruckner
e872d40223
MSVC: Disable deprecation warnings for C89 functions
...
C89 sadly doesn't provide safe alternatives for strcpy, sprintf and the
like.
2017-06-28 17:28:50 +02:00
Max Bruckner
21733eb02e
tests/print_number: Use proper double literals
2017-06-28 17:28:49 +02:00
Max Bruckner
a9ce4e6bbc
Add warning -Wswitch-enum
2017-06-28 17:28:49 +02:00
Max Bruckner
eb8c0baa3b
Add warning -Wused-but-marked-unused
2017-06-28 17:28:49 +02:00
Max Bruckner
4e0c119391
Add warning -Wmissing-variable-declarations
2017-06-28 17:28:49 +02:00
