From 2655e657e1cf6eec9067a7cd9529d2f2d4cf7b5a Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 30 Mar 2020 21:51:46 +0000 Subject: merge revision(s) 77596fb7a91cc119b25ac9e19b3c8682709765b4: [Backport #16138] Do not turn on keyword_init for Struct subclass if keyword hash is empty This was accidentally turned on because there was no checking for Qundef. Also, since only a single keyword is currently supported, simplify the rb_get_kwargs call. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@67866 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- struct.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'struct.c') diff --git a/struct.c b/struct.c index cf28fec6fd..16b1fe7c62 100644 --- a/struct.c +++ b/struct.c @@ -517,7 +517,7 @@ rb_struct_define_under(VALUE outer, const char *name, ...) static VALUE rb_struct_s_def(int argc, VALUE *argv, VALUE klass) { - VALUE name, rest, keyword_init; + VALUE name, rest, keyword_init = Qfalse; long i; VALUE st; st_table *tbl; @@ -533,18 +533,16 @@ rb_struct_s_def(int argc, VALUE *argv, VALUE klass) } if (RB_TYPE_P(argv[argc-1], T_HASH)) { - VALUE kwargs[1]; static ID keyword_ids[1]; if (!keyword_ids[0]) { keyword_ids[0] = rb_intern("keyword_init"); } - rb_get_kwargs(argv[argc-1], keyword_ids, 0, 1, kwargs); + rb_get_kwargs(argv[argc-1], keyword_ids, 0, 1, &keyword_init); + if (keyword_init == Qundef) { + keyword_init = Qfalse; + } --argc; - keyword_init = kwargs[0]; - } - else { - keyword_init = Qfalse; } rest = rb_ident_hash_new(); -- cgit v1.2.3