Skip to content

Commit f1819c9

Browse files
author
Calvin Rose
committed
Fix build error for 1.15.2
1 parent dd14b24 commit f1819c9

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4-
## 1.15.1 - 2021-02-15
4+
## 1.15.2 - 2021-02-15
55
- Fix bug in windows version of `os/spawn` and `os/execute` with setting environment variables.
66
- Fix documentation typos.
77
- Fix peg integer reading combinators when used with capture tags.

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
project('janet', 'c',
2222
default_options : ['c_std=c99', 'b_lundef=false', 'default_library=both'],
23-
version : '1.15.1')
23+
version : '1.15.2')
2424

2525
# Global settings
2626
janet_path = join_paths(get_option('prefix'), get_option('libdir'), 'janet')

src/conf/janetconf.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
#define JANET_VERSION_MAJOR 1
77
#define JANET_VERSION_MINOR 15
8-
#define JANET_VERSION_PATCH 1
8+
#define JANET_VERSION_PATCH 2
99
#define JANET_VERSION_EXTRA ""
10-
#define JANET_VERSION "1.15.1"
10+
#define JANET_VERSION "1.15.2"
1111

1212
/* #define JANET_BUILD "local" */
1313

src/core/os.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,13 +249,13 @@ static EnvBlock os_execute_env(int32_t argc, const Janet *argv) {
249249
static void os_execute_cleanup(EnvBlock envp, const char **child_argv) {
250250
#ifdef JANET_WINDOWS
251251
(void) child_argv;
252-
janet_sfree(envp);
252+
if (NULL != envp) janet_sfree(envp);
253253
#else
254254
janet_sfree((void *)child_argv);
255255
if (NULL != envp) {
256256
char **envitem = envp;
257257
while (*envitem != NULL) {
258-
free(*envitem);
258+
janet_sfree(*envitem);
259259
envitem++;
260260
}
261261
}

0 commit comments

Comments
 (0)