1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RSTRING_PTR is not guaranteed to be VALUE-aligned

Browse Source 
Don't abuse struct RString to hold arbitrary memory region.
Thanks to @mame we now have rb_imemo_alloc_auto_free_pointer
so use it instead.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63373 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2018-05-09 07:46:11 +00:00
parent e9303e1a00
commit a6108df948
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
process.c
View File

@ -2355,6 +2355,16 @@ open_func(void *ptr)
return NULL; return NULL;
} }
static void
rb_execarg_allocate_dup2_tmpbuf(struct rb_execarg *eargp, long len)
{
eargp->dup2_tmpbuf =
rb_imemo_tmpbuf_auto_free_pointer(
ruby_xmalloc(
run_exec_dup2_tmpbuf_size(
len)));
}
static VALUE static VALUE
rb_execarg_parent_start1(VALUE execarg_obj) rb_execarg_parent_start1(VALUE execarg_obj)
{ {
@ -2409,10 +2419,7 @@ rb_execarg_parent_start1(VALUE execarg_obj)
ary = eargp->fd_dup2; ary = eargp->fd_dup2;
if (ary != Qfalse) { if (ary != Qfalse) {
size_t len = run_exec_dup2_tmpbuf_size(RARRAY_LEN(ary)); rb_execarg_allocate_dup2_tmpbuf(eargp, RARRAY_LEN(ary));
VALUE tmpbuf = hide_obj(rb_str_new(0, len));
rb_str_set_len(tmpbuf, len);
eargp->dup2_tmpbuf = tmpbuf;
} }
unsetenv_others = eargp->unsetenv_others_given && eargp->unsetenv_others_do; unsetenv_others = eargp->unsetenv_others_given && eargp->unsetenv_others_do;
@ -2775,10 +2782,10 @@ run_exec_dup2(VALUE ary, VALUE tmpbuf, struct rb_execarg *sargp, char *errmsg, s
long n, i; long n, i;
int ret; int ret;
int extra_fd = -1; int extra_fd = -1;
struct run_exec_dup2_fd_pair *pairs = 0; struct rb_imemo_tmpbuf_struct *buf = (void *)tmpbuf;
struct run_exec_dup2_fd_pair *pairs = (void *)buf->ptr;
n = RARRAY_LEN(ary); n = RARRAY_LEN(ary);
pairs = (struct run_exec_dup2_fd_pair *)RSTRING_PTR(tmpbuf);
/* initialize oldfd and newfd: O(n) */ /* initialize oldfd and newfd: O(n) */
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
@ -3155,10 +3162,7 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *sargp,
if (sargp) { if (sargp) {
VALUE ary = sargp->fd_dup2; VALUE ary = sargp->fd_dup2;
if (ary != Qfalse) { if (ary != Qfalse) {
size_t len = run_exec_dup2_tmpbuf_size(RARRAY_LEN(ary)); rb_execarg_allocate_dup2_tmpbuf(sargp, RARRAY_LEN(ary));
VALUE tmpbuf = hide_obj(rb_str_new(0, len));
rb_str_set_len(tmpbuf, len);
sargp->dup2_tmpbuf = tmpbuf;
} }
} }