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

Use MRB_ENSURE() instead of mrb_ensure()

Browse Source 
The purpose is to avoid using the `MRB_TT_CPTR` object.
The reasons are as follows:
  - The `MRB_WORD_BOXING` setting involves object creation.
  - If object creation fails, the `ary_set_t` data leaks memory.
This commit is contained in:
dearblue
2026-01-24 11:32:57 +09:00
parent 3ac682b2de
commit da75e4b049
2 changed files with 27 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-array-ext/mrbgem.rake
-1
View File
@@ -2,5 +2,4 @@ MRuby::Gem::Specification.new('mruby-array-ext') do |spec|
spec.license = 'MIT'
spec.author = 'mruby developers'
spec.summary = 'Array class extension'
spec.add_dependency 'mruby-error'
end
mrbgems/mruby-array-ext/src/array.c
+27 -60
View File
@@ -452,9 +452,9 @@ struct ary_subtract_ctx {
};
static mrb_value
ary_subtract_body(mrb_state *mrb, mrb_value data)
ary_subtract_body(mrb_state *mrb, void *data)
{
struct ary_subtract_ctx *ctx = (struct ary_subtract_ctx *)mrb_cptr(data);
struct ary_subtract_ctx *ctx = (struct ary_subtract_ctx *)data;
for (mrb_int i = 0; i < ctx->argc; i++) {
ary_populate_temp_set(mrb, ctx->set, ctx->argv[i]);
@@ -471,14 +471,6 @@ ary_subtract_body(mrb_state *mrb, mrb_value data)
return ctx->result;
}
static mrb_value
ary_subtract_ensure(mrb_state *mrb, mrb_value data)
{
struct ary_subtract_ctx *ctx = (struct ary_subtract_ctx *)mrb_cptr(data);
ary_destroy_temp_set(mrb, ctx->set);
return mrb_nil_value();
}
static mrb_value
ary_subtract_internal(mrb_state *mrb, mrb_value self, mrb_int argc, const mrb_value *argv)
{
@@ -502,8 +494,9 @@ ary_subtract_internal(mrb_state *mrb, mrb_value self, mrb_int argc, const mrb_va
ary_init_temp_set(mrb, set, total_len);
struct ary_subtract_ctx ctx = { set, self, result, argv_copies, argc };
mrb_ensure(mrb, ary_subtract_body, mrb_cptr_value(mrb, &ctx),
ary_subtract_ensure, mrb_cptr_value(mrb, &ctx));
MRB_ENSURE(mrb, result, ary_subtract_body, &ctx) {
ary_destroy_temp_set(mrb, set);
}
}
else {
mrb_int self_len = RARRAY_LEN(self);
@@ -588,9 +581,9 @@ struct ary_union_ctx {
};
static mrb_value
ary_union_body(mrb_state *mrb, mrb_value data)
ary_union_body(mrb_state *mrb, void *data)
{
struct ary_union_ctx *ctx = (struct ary_union_ctx *)mrb_cptr(data);
struct ary_union_ctx *ctx = (struct ary_union_ctx *)data;
/* Add unique elements from self */
for (mrb_int i = 0; i < RARRAY_LEN(ctx->self_copy); i++) {
@@ -618,14 +611,6 @@ ary_union_body(mrb_state *mrb, mrb_value data)
return ctx->result;
}
static mrb_value
ary_union_ensure(mrb_state *mrb, mrb_value data)
{
struct ary_union_ctx *ctx = (struct ary_union_ctx *)mrb_cptr(data);
ary_destroy_temp_set(mrb, ctx->set);
return mrb_nil_value();
}
static mrb_value
ary_union_internal(mrb_state *mrb, mrb_value self, mrb_int argc, const mrb_value *argv)
{
@@ -646,8 +631,9 @@ ary_union_internal(mrb_state *mrb, mrb_value self, mrb_int argc, const mrb_value
ary_init_temp_set(mrb, set, total_len);
struct ary_union_ctx ctx = { set, self_copy, result, argv_copies, argc };
mrb_ensure(mrb, ary_union_body, mrb_cptr_value(mrb, &ctx),
ary_union_ensure, mrb_cptr_value(mrb, &ctx));
MRB_ENSURE(mrb, result, ary_union_body, &ctx) {
ary_destroy_temp_set(mrb, set);
}
}
else {
/* Use linear search for small arrays */
@@ -717,9 +703,9 @@ struct ary_intersection_ctx {
};
static mrb_value
ary_intersection_body(mrb_state *mrb, mrb_value data)
ary_intersection_body(mrb_state *mrb, void *data)
{
struct ary_intersection_ctx *ctx = (struct ary_intersection_ctx *)mrb_cptr(data);
struct ary_intersection_ctx *ctx = (struct ary_intersection_ctx *)data;
for (mrb_int i = 0; i < ctx->argc; i++) {
ary_populate_temp_set(mrb, ctx->set, ctx->argv[i]);
@@ -737,14 +723,6 @@ ary_intersection_body(mrb_state *mrb, mrb_value data)
return ctx->result;
}
static mrb_value
ary_intersection_ensure(mrb_state *mrb, mrb_value data)
{
struct ary_intersection_ctx *ctx = (struct ary_intersection_ctx *)mrb_cptr(data);
ary_destroy_temp_set(mrb, ctx->set);
return mrb_nil_value();
}
static mrb_value
ary_intersection_internal(mrb_state *mrb, mrb_value self, mrb_int argc, const mrb_value *argv)
{
@@ -768,8 +746,9 @@ ary_intersection_internal(mrb_state *mrb, mrb_value self, mrb_int argc, const mr
ary_init_temp_set(mrb, set, total_len);
struct ary_intersection_ctx ctx = { set, self, result, argv_copies, argc };
mrb_ensure(mrb, ary_intersection_body, mrb_cptr_value(mrb, &ctx),
ary_intersection_ensure, mrb_cptr_value(mrb, &ctx));
MRB_ENSURE(mrb, result, ary_intersection_body, &ctx) {
ary_destroy_temp_set(mrb, set);
}
}
else {
mrb_int self_len = RARRAY_LEN(self);
@@ -869,9 +848,9 @@ struct ary_intersect_p_ctx {
};
static mrb_value
ary_intersect_p_body(mrb_state *mrb, mrb_value data)
ary_intersect_p_body(mrb_state *mrb, void *data)
{
struct ary_intersect_p_ctx *ctx = (struct ary_intersect_p_ctx *)mrb_cptr(data);
struct ary_intersect_p_ctx *ctx = (struct ary_intersect_p_ctx *)data;
ary_populate_temp_set(mrb, ctx->set, ctx->shorter_ary_copy);
@@ -886,14 +865,6 @@ ary_intersect_p_body(mrb_state *mrb, mrb_value data)
return mrb_nil_value();
}
static mrb_value
ary_intersect_p_ensure(mrb_state *mrb, mrb_value data)
{
struct ary_intersect_p_ctx *ctx = (struct ary_intersect_p_ctx *)mrb_cptr(data);
ary_destroy_temp_set(mrb, ctx->set);
return mrb_nil_value();
}
static mrb_value
ary_intersect_p(mrb_state *mrb, mrb_value self)
{
@@ -924,8 +895,10 @@ ary_intersect_p(mrb_state *mrb, mrb_value self)
mrb_bool found = FALSE;
struct ary_intersect_p_ctx ctx = { set, shorter_ary_copy, longer_ary, &found };
mrb_ensure(mrb, ary_intersect_p_body, mrb_cptr_value(mrb, &ctx),
ary_intersect_p_ensure, mrb_cptr_value(mrb, &ctx));
mrb_value result;
MRB_ENSURE(mrb, result, ary_intersect_p_body, &ctx) {
ary_destroy_temp_set(mrb, set);
}
if (found) {
return mrb_true_value();
@@ -1089,9 +1062,9 @@ struct ary_uniq_bang_ctx {
};
static mrb_value
ary_uniq_bang_body(mrb_state *mrb, mrb_value data)
ary_uniq_bang_body(mrb_state *mrb, void *data)
{
struct ary_uniq_bang_ctx *ctx = (struct ary_uniq_bang_ctx *)mrb_cptr(data);
struct ary_uniq_bang_ctx *ctx = (struct ary_uniq_bang_ctx *)data;
ary_populate_temp_set(mrb, ctx->set, ctx->self_copy);
@@ -1110,14 +1083,6 @@ ary_uniq_bang_body(mrb_state *mrb, mrb_value data)
return mrb_nil_value();
}
static mrb_value
ary_uniq_bang_ensure(mrb_state *mrb, mrb_value data)
{
struct ary_uniq_bang_ctx *ctx = (struct ary_uniq_bang_ctx *)mrb_cptr(data);
ary_destroy_temp_set(mrb, ctx->set);
return mrb_nil_value();
}
static mrb_value
ary_uniq_bang(mrb_state *mrb, mrb_value self)
{
@@ -1139,8 +1104,10 @@ ary_uniq_bang(mrb_state *mrb, mrb_value self)
ary_init_temp_set(mrb, set, len);
struct ary_uniq_bang_ctx ctx = { set, self_copy, self, &write_pos, len };
mrb_ensure(mrb, ary_uniq_bang_body, mrb_cptr_value(mrb, &ctx),
ary_uniq_bang_ensure, mrb_cptr_value(mrb, &ctx));
mrb_value result;
MRB_ENSURE(mrb, result, ary_uniq_bang_body, &ctx) {
ary_destroy_temp_set(mrb, set);
}
}
else {
for (mrb_int read_pos = 0; read_pos < len; read_pos++) {