aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-07-24 15:40:05 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-07-24 15:40:05 +0000
commitcd2eaf2a33e42d9842ac6e6bdb50a14c8d0553ad (patch)
tree21fa75252d6d2905dc4e47159de23802d5b4e009
parent461c79f17c4b01d8802bd57d893e0df75ec35d7a (diff)
downloadruby-cd2eaf2a33e42d9842ac6e6bdb50a14c8d0553ad.tar.gz
mjit.c: handle memory allocation failure
which was missing in r64033. Prior to r64033, memory allocation failure had been checked by TRY_WITH_GC and handled by rb_memerror. But calling rb_memerror on MJIT worker is problematic since it does EC_JUMP_TAG in the end. Threads except Ruby's main thread must not use it. mjit_compile.c: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64037 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--mjit.c5
-rw-r--r--mjit_compile.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/mjit.c b/mjit.c
index 473f60ccb4..eca995742b 100644
--- a/mjit.c
+++ b/mjit.c
@@ -334,7 +334,8 @@ form_args(int num, ...)
for (i = len = 0; i < num; i++) {
args = va_arg(argp, char **);
n = args_len(args);
- res = (char **)realloc(res, sizeof(char *) * (len + n + 1));
+ if ((res = (char **)realloc(res, sizeof(char *) * (len + n + 1))) == NULL)
+ return NULL;
MEMCPY(res + len, args, char *, n + 1);
len += n;
}
@@ -767,6 +768,8 @@ compile_c_to_so(const char *c_file, const char *so_file)
#ifdef _MSC_VER
solen = strlen(so_file);
files[0] = p = (char *)malloc(sizeof(char) * (rb_strlen_lit("-Fe") + solen + 1));
+ if (p == NULL)
+ return FALSE;
p = append_lit(p, "-Fe");
p = append_str2(p, so_file, solen);
*p = '\0';
diff --git a/mjit_compile.c b/mjit_compile.c
index 7b8e2a7312..a44d9d9aba 100644
--- a/mjit_compile.c
+++ b/mjit_compile.c
@@ -193,6 +193,8 @@ mjit_compile(FILE *f, const struct rb_iseq_constant_body *body, const char *func
status.success = TRUE;
status.local_stack_p = !body->catch_except_p;
status.stack_size_for_pos = (int *)malloc(sizeof(int) * body->iseq_size);
+ if (status.stack_size_for_pos == NULL)
+ return FALSE;
memset(status.stack_size_for_pos, NOT_COMPILED_STACK_SIZE, sizeof(int) * body->iseq_size);
/* For performance, we verify stack size only on compilation time (mjit_compile.inc.erb) without --jit-debug */