Skip to content

Commit d348621

Browse files
author
Alan Wang
authored
chore: update version and changelog (DaveGamble#610)
1 parent 744e473 commit d348621

File tree

5 files changed

+14
-4
lines changed

5 files changed

+14
-4
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
1.7.15 (Aug 25, 2021)
2+
======
3+
Fixes:
4+
------
5+
* Fix potential core dumped for strrchr, see [#546](https://github.com/DaveGamble/cJSON/pull/546)
6+
* Fix null pointer crash in cJSON_CreateXxArray, see [#538](https://github.com/DaveGamble/cJSON/pull/538)
7+
* Fix several null pointer problems on allocation failure, see [#526](https://github.com/DaveGamble/cJSON/pull/526)
8+
* Fix a possible dereference of null pointer, see [#519](https://github.com/DaveGamble/cJSON/pull/519)
9+
* Fix windows build failure about defining nan, see [#518](https://github.com/DaveGamble/cJSON/pull/518)
10+
111
1.7.14 (Sep 3, 2020)
212
======
313
Fixes:

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ include(GNUInstallDirs)
77

88
set(PROJECT_VERSION_MAJOR 1)
99
set(PROJECT_VERSION_MINOR 7)
10-
set(PROJECT_VERSION_PATCH 14)
10+
set(PROJECT_VERSION_PATCH 15)
1111
set(CJSON_VERSION_SO 1)
1212
set(CJSON_UTILS_VERSION_SO 1)
1313
set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CJSON_TEST_SRC = cJSON.c test.c
88

99
LDLIBS = -lm
1010

11-
LIBVERSION = 1.7.14
11+
LIBVERSION = 1.7.15
1212
CJSON_SOVERSION = 1
1313
UTILS_SOVERSION = 1
1414

cJSON.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON * const item)
117117
}
118118

119119
/* This is a safeguard to prevent copy-pasters from using incompatible C and header files */
120-
#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 14)
120+
#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 15)
121121
#error cJSON.h and cJSON.c have different versions. Make sure that both have the same.
122122
#endif
123123

cJSON.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJ
8181
/* project version */
8282
#define CJSON_VERSION_MAJOR 1
8383
#define CJSON_VERSION_MINOR 7
84-
#define CJSON_VERSION_PATCH 14
84+
#define CJSON_VERSION_PATCH 15
8585

8686
#include <stddef.h>
8787

0 commit comments

Comments
 (0)