From 28211d677173c8279cfa8b89dd7df31ec30ee1c3 Mon Sep 17 00:00:00 2001 From: Frederick John Milens III Date: Thu, 22 Aug 2013 16:44:00 -0500 Subject: Fix for string-length-related issue in String#start_with? logic. --- mrbgems/mruby-string-ext/src/string.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'mrbgems/mruby-string-ext') diff --git a/mrbgems/mruby-string-ext/src/string.c b/mrbgems/mruby-string-ext/src/string.c index edebcecbc..9763794f4 100644 --- a/mrbgems/mruby-string-ext/src/string.c +++ b/mrbgems/mruby-string-ext/src/string.c @@ -107,6 +107,7 @@ mrb_str_concat2(mrb_state *mrb, mrb_value self) * # returns true if one of the prefixes matches. * "hello".start_with?("heaven", "hell") #=> true * "hello".start_with?("heaven", "paradise") #=> false + * "h".start_with?("heaven", "hell") #=> false */ static mrb_value mrb_str_start_with(mrb_state *mrb, mrb_value self) @@ -119,10 +120,12 @@ mrb_str_start_with(mrb_state *mrb, mrb_value self) size_t len_l, len_r, len_cmp; 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), RSTRING_PTR(argv[i]), len_cmp) == 0) { - return mrb_true_value(); - } + if (len_l >= len_r) { + len_cmp = (len_l > len_r) ? len_r : len_l; + if (memcmp(RSTRING_PTR(self), RSTRING_PTR(argv[i]), len_cmp) == 0) { + return mrb_true_value(); + } + } } return mrb_false_value(); } -- cgit v1.2.3