From 5c4fb22809f2da261e3957dc7fc42e19193f70b7 Mon Sep 17 00:00:00 2001 From: Anton Korobeynikov Date: Tue, 5 Feb 2008 23:34:40 +0000 Subject: [PATCH] Don't dereference an invalid pointer if string is empty. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@46781 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/StringMap.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/llvm/ADT/StringMap.h b/include/llvm/ADT/StringMap.h index dd040f927db..27ea5d3ea1b 100644 --- a/include/llvm/ADT/StringMap.h +++ b/include/llvm/ADT/StringMap.h @@ -273,7 +273,7 @@ public: return find(Key, Key + strlen(Key)); } iterator find(const std::string &Key) { - const char* key_start = &Key[0]; + const char* key_start = (Key.empty() ? NULL : &Key[0]); return find(key_start, key_start + Key.size()); } @@ -286,7 +286,7 @@ public: return find(Key, Key + strlen(Key)); } const_iterator find(const std::string &Key) const { - const char* key_start = &Key[0]; + const char* key_start = (Key.empty() ? NULL : &Key[0]); return find(key_start, key_start + Key.size()); } @@ -295,7 +295,7 @@ public: return entry.getValue(); } ValueTy& operator[](const std::string &Key) { - const char* key_start = &Key[0]; + const char* key_start = (Key.empty() ? NULL : &Key[0]); value_type& entry = GetOrCreateValue(key_start, key_start + Key.size()); return entry.getValue(); } @@ -307,7 +307,7 @@ public: return count(Key, Key + strlen(Key)); } size_type count(const std::string &Key) const { - const char* key_start = &Key[0]; + const char* key_start = (Key.empty() ? NULL : &Key[0]); return count(key_start, key_start + Key.size()); }