diff options
| author |  Calvin Rose <crose@gmail.com> | 2021-02-15 10:27:19 -0600 |
|---|---|---|
| committer | Calvin Rose <crose@gmail.com> | 2021-02-15 10:27:19 -0600 |
| commit | f1819c916a3ed8ba931de572ee3e5fe73bf37e0c (patch) | |
| tree | 11776fd241720cbd4c7dadbd7092e3252aa583a9 | |
| parent | 1.15.1 release. (diff) | |
Fix build error for 1.15.2v1.15.2
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/conf/janetconf.h | 4 | ||||
| -rw-r--r-- | src/core/os.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a91e951a..0fcc419b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog All notable changes to this project will be documented in this file. -## 1.15.1 - 2021-02-15 +## 1.15.2 - 2021-02-15 - Fix bug in windows version of `os/spawn` and `os/execute` with setting environment variables. - Fix documentation typos. - Fix peg integer reading combinators when used with capture tags. diff --git a/meson.build b/meson.build index a0c5ce06..d36d918e 100644 --- a/meson.build +++ b/meson.build @@ -20,7 +20,7 @@ project('janet', 'c', default_options : ['c_std=c99', 'b_lundef=false', 'default_library=both'], - version : '1.15.1') + version : '1.15.2') # Global settings janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet') diff --git a/src/conf/janetconf.h b/src/conf/janetconf.h index aee756f8..d6d5be7f 100644 --- a/src/conf/janetconf.h +++ b/src/conf/janetconf.h @@ -5,9 +5,9 @@ #define JANET_VERSION_MAJOR 1 #define JANET_VERSION_MINOR 15 -#define JANET_VERSION_PATCH 1 +#define JANET_VERSION_PATCH 2 #define JANET_VERSION_EXTRA "" -#define JANET_VERSION "1.15.1" +#define JANET_VERSION "1.15.2" /* #define JANET_BUILD "local" */ diff --git a/src/core/os.c b/src/core/os.c index a16d472d..2ebb09c0 100644 --- a/src/core/os.c +++ b/src/core/os.c @@ -249,13 +249,13 @@ static EnvBlock os_execute_env(int32_t argc, const Janet *argv) { static void os_execute_cleanup(EnvBlock envp, const char **child_argv) { #ifdef JANET_WINDOWS (void) child_argv; - janet_sfree(envp); + if (NULL != envp) janet_sfree(envp); #else janet_sfree((void *)child_argv); if (NULL != envp) { char **envitem = envp; while (*envitem != NULL) { - free(*envitem); + janet_sfree(*envitem); envitem++; } } |