diff options
| -rw-r--r-- | mrbgems/mruby-string-ext/src/string.c | 15 | ||||
| -rw-r--r-- | mrbgems/mruby-string-ext/test/string.rb | 1 |
2 files changed, 9 insertions, 7 deletions
diff --git a/mrbgems/mruby-string-ext/src/string.c b/mrbgems/mruby-string-ext/src/string.c index 33ed3095b..7bb6254ce 100644 --- a/mrbgems/mruby-string-ext/src/string.c +++ b/mrbgems/mruby-string-ext/src/string.c @@ -143,15 +143,16 @@ mrb_str_end_with(mrb_state *mrb, mrb_value self) mrb_get_args(mrb, "*", &argv, &argc); for (i = 0; i < argc; i++) { - size_t len_l, len_r, len_cmp; + size_t len_l, len_r; len_l = RSTRING_LEN(self); len_r = RSTRING_LEN(argv[i]); - len_cmp = (len_l > len_r) ? len_r : len_l; - if (memcmp(RSTRING_PTR(self) + (len_l - len_cmp), - RSTRING_PTR(argv[i]) + (len_r - len_cmp), - len_cmp) == 0) { - return mrb_true_value(); - } + if (len_l >= len_r) { + if (memcmp(RSTRING_PTR(self) + (len_l - len_r), + RSTRING_PTR(argv[i]), + len_r) == 0) { + return mrb_true_value(); + } + } } return mrb_false_value(); } diff --git a/mrbgems/mruby-string-ext/test/string.rb b/mrbgems/mruby-string-ext/test/string.rb index 79e4360b5..6bd868993 100644 --- a/mrbgems/mruby-string-ext/test/string.rb +++ b/mrbgems/mruby-string-ext/test/string.rb @@ -110,4 +110,5 @@ end assert('String#end_with?') do assert_true "string".end_with?("ing", "mng") assert_true !"string".end_with?("str", "tri") + assert_true !"ng".end_with?("ing", "mng") end |