Fix for string-length-related issue in String#end_with? logic.

1 files changed, 8 insertions, 6 deletions

diff --git a/mrbgems/mruby-string-ext/src/string.c b/mrbgems/mruby-string-ext/src/string.c
index edebcecbc..e2ba24d1b 100644
--- a/mrbgems/mruby-string-ext/src/string.c
+++ b/mrbgems/mruby-string-ext/src/string.c
@@ -144,12 +144,14 @@ mrb_str_end_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) + (len_l - len_cmp),
-               RSTRING_PTR(argv[i]) + (len_r - len_cmp),
-               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) + (len_l - len_cmp),
+                 RSTRING_PTR(argv[i]) + (len_r - len_cmp),
+                 len_cmp) == 0) {
+        return mrb_true_value();
+      }  
+    }
   }
   return mrb_false_value();
 }