Crash when timeout finishes (#999)

Author: mfikes

CHANGELOG.md

@@ -31,6 +31,7 @@ All notable changes to this project will be documented in this file. This change
 - `tty?` spec refers to `planck.core/IWriter` ([#928](https://github.com/planck-repl/planck/issues/928))
 - HTTP binary response includes trailing buffer ([#949](https://github.com/planck-repl/planck/issues/949))
 - IO encoding should default to UTF-8 if unspecified ([#960](https://github.com/planck-repl/planck/issues/960))
+- Crash when timeout finishes ([#998](https://github.com/planck-repl/planck/issues/998))
 
 ## [2.23.0] - 2019-05-19
 ### Added

planck-c/engine.c

@@ -197,6 +197,7 @@ void evaluate_source(char *type, char *source, bool expression, bool print_nil,
         }
     }
 
+    acquire_eval_lock();
     JSValueRef args[6];
     size_t num_args = 6;
 
@@ -226,7 +227,6 @@ void evaluate_source(char *type, char *source, bool expression, bool print_nil,
     }
     JSObjectRef global_obj = JSContextGetGlobalObject(ctx);
 
-    acquire_eval_lock();
     JSObjectCallAsFunction(ctx, execute_fn, global_obj, num_args, args, NULL);
     release_eval_lock();
 }
@@ -330,9 +330,9 @@ void run_main_cli_fn() {
         return;
     }
 
+    acquire_eval_lock();
     JSObjectRef global_obj = JSContextGetGlobalObject(ctx);
     JSObjectRef run_main_cli_fn = get_function("planck.repl", "run-main-cli-fn");
-    acquire_eval_lock();
     JSObjectCallAsFunction(ctx, run_main_cli_fn, global_obj, 0, NULL, NULL);
     release_eval_lock();
 }

planck-c/functions.c

@@ -1260,6 +1260,7 @@ void do_run_timeout(void *data) {
 
     unsigned long *timeout_data = data;
 
+    acquire_eval_lock();
     JSValueRef args[1];
     args[0] = JSValueMakeNumber(ctx, (double)*timeout_data);
     free(timeout_data);
@@ -1269,7 +1270,6 @@ void do_run_timeout(void *data) {
         run_timeout_fn = get_function("global", "PLANCK_RUN_TIMEOUT");
         JSValueProtect(ctx, run_timeout_fn);
     }
-    acquire_eval_lock();
     JSObjectCallAsFunction(ctx, run_timeout_fn, NULL, 1, args, NULL);
     release_eval_lock();
 }
@@ -1310,6 +1310,7 @@ void do_run_interval(void *data) {
 
     unsigned long *interval_data = data;
 
+    acquire_eval_lock();
     JSValueRef args[1];
     args[0] = JSValueMakeNumber(ctx, (double)*interval_data);
     free(interval_data);
@@ -1319,7 +1320,7 @@ void do_run_interval(void *data) {
         run_interval_fn = get_function("global", "PLANCK_RUN_INTERVAL");
         JSValueProtect(ctx, run_interval_fn);
     }
-    acquire_eval_lock();
+
     JSObjectCallAsFunction(ctx, run_interval_fn, NULL, 1, args, NULL);
     release_eval_lock();
 }
@@ -1378,6 +1379,7 @@ conn_data_cb_ret_t *socket_conn_data_arrived(char *data, int sock, void *info) {
 
     data_arrived_info_t *data_arrived_info = info;
 
+    acquire_eval_lock();
     JSValueRef args[2];
     args[0] = JSValueMakeNumber(ctx, sock);
 
@@ -1388,7 +1390,6 @@ conn_data_cb_ret_t *socket_conn_data_arrived(char *data, int sock, void *info) {
         args[1] = JSValueMakeNull(ctx);
     }
 
-    acquire_eval_lock();
     JSObjectCallAsFunction(ctx, data_arrived_info->data_arrived_cb, NULL, 2, args, NULL);
     release_eval_lock();
 
@@ -1408,16 +1409,16 @@ accepted_conn_cb_ret_t *accepted_socket_connection(int sock, void *info) {
 
     accept_info_t *accept_info = info;
 
+    acquire_eval_lock();
     JSValueRef args[1];
     args[0] = JSValueMakeNumber(ctx, sock);
 
-    acquire_eval_lock();
     JSValueRef data_arrived_cb_ref = JSObjectCallAsFunction(ctx, accept_info->accept_cb, NULL, 1, args, NULL);
-    release_eval_lock();
 
     data_arrived_info_t *data_arrived_info = malloc(sizeof(data_arrived_info_t));
     data_arrived_info->data_arrived_cb = JSValueToObject(ctx, data_arrived_cb_ref, NULL);
     JSValueProtect(ctx, data_arrived_cb_ref);
+    release_eval_lock();
 
     accepted_conn_cb_ret_t *accepted_conn_cb_ret = malloc(sizeof(accepted_conn_cb_ret_t));