From a4bbb5bab4ea49bc0f4cb9638f27a7eb68e1bdb6 Mon Sep 17 00:00:00 2001
From: nham <hamann.nick@gmail.com>
Date: Mon, 18 Aug 2014 17:51:51 -0400
Subject: Fix underflow bug in core::str::Searcher::new for haystacks of length
 < 20

---
 src/libcore/str.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/libcore/str.rs b/src/libcore/str.rs
index 095605326c7..800e2dcc278 100644
--- a/src/libcore/str.rs
+++ b/src/libcore/str.rs
@@ -562,7 +562,7 @@ enum Searcher {
 impl Searcher {
     fn new(haystack: &[u8], needle: &[u8]) -> Searcher {
         // FIXME: Tune this.
-        if needle.len() > haystack.len() - 20 {
+        if needle.len() + 20 > haystack.len() {
             Naive(NaiveSearcher::new())
         } else {
             let searcher = TwoWaySearcher::new(needle);
-- 
cgit 1.4.1-3-g733a5