admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid memcpy() on copying structures.

Browse Source
This commit is contained in:
Masaki Muranaka
2012-10-22 10:36:49 +09:00
parent 0debca9bdf
commit 2cb183f183
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/struct.c
+12 -2
View File
@@ -94,6 +94,16 @@ mrb_struct_s_members_m(mrb_state *mrb, mrb_value klass)
return ary;
}
static inline void
struct_copy(mrb_value *dst, const mrb_value *src, size_t size)
{
size_t i;
for (i = 0; i < size; i++) {
dst[i] = src[i];
}
}
/* 15.2.18.4.6 */
/*
* call-seq:
@@ -431,7 +441,7 @@ mrb_struct_initialize_withArg(mrb_state *mrb, int argc, mrb_value *argv, mrb_val
st = RSTRUCT(self);
st->ptr = (mrb_value *)mrb_calloc(mrb, sizeof(mrb_value), n);
st->len = n;
memcpy(st->ptr, argv, sizeof(mrb_value)*argc);
struct_copy(st->ptr, argv, argc);
return self;
}
@@ -530,7 +540,7 @@ mrb_struct_init_copy(mrb_state *mrb, mrb_value copy)
if (RSTRUCT_LEN(copy) != RSTRUCT_LEN(s)) {
mrb_raise(mrb, E_TYPE_ERROR, "struct size mismatch");
}
memcpy(RSTRUCT_PTR(copy), RSTRUCT_PTR(s), sizeof(mrb_value)*RSTRUCT_LEN(copy));
struct_copy(RSTRUCT_PTR(copy), RSTRUCT_PTR(s), RSTRUCT_LEN(copy));
return copy;
}