From: Ted Kremenek <kremenek@apple.com>
Date: Wed, 22 Oct 2008 23:16:52 +0000 (+0000)
Subject: Fix incorrect testing for the end of the both strings in CStrInCStrNoCase.  This... 
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=30f100e14056c2fd88a3448c8bf89b656e7d8584;p=oota-llvm.git

Fix incorrect testing for the end of the both strings in CStrInCStrNoCase.  This could cause a read-out-of-bounds error if s2 is smaller than s1.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@58009 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/ADT/StringExtras.h b/include/llvm/ADT/StringExtras.h
index 872c8451bf5..fcd03982e61 100644
--- a/include/llvm/ADT/StringExtras.h
+++ b/include/llvm/ADT/StringExtras.h
@@ -159,7 +159,7 @@ static inline const char* CStrInCStrNoCase(const char *s1, const char *s2) {
   
   const char *I1=s1, *I2=s2;
   
-  while (*I1 != '\0' || *I2 != '\0' )
+  while (*I1 != '\0' && *I2 != '\0' )
     if (tolower(*I1) != tolower(*I2)) { // No match.  Start over.
       ++s1; I1 = s1; I2 = s2;
     }