Fix build error for 1.15.2

janet-lang · Feb 15, 2021 · f1819c9 · f1819c9
1 parent dd14b24
commit f1819c9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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++;
         }
     }