diff options
author | Daniel Dunbar <daniel@zuster.org> | 2009-08-01 23:40:20 +0000 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2009-08-01 23:40:20 +0000 |
commit | 36741c8a29866375a4a4ba91d66c5826359b7046 (patch) | |
tree | e9b04e683f6a4e6b7aa1cee6dcfaca2de4bc915b /clang/lib | |
parent | 6cfaa47c852359a304fbcf546d9a6626ae0e55fb (diff) | |
download | bcm5719-llvm-36741c8a29866375a4a4ba91d66c5826359b7046.tar.gz bcm5719-llvm-36741c8a29866375a4a4ba91d66c5826359b7046.zip |
Avoid accessing invalid std::vector element; this makes clang
ENABLE_EXPENSIVE_CHECKS clean on x86_64-.*-darwin10.
llvm-svn: 77831
Diffstat (limited to 'clang/lib')
-rw-r--r-- | clang/lib/AST/DeclCXX.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/AST/DeclCXX.cpp b/clang/lib/AST/DeclCXX.cpp index cc481be6ba8..4a2f799b273 100644 --- a/clang/lib/AST/DeclCXX.cpp +++ b/clang/lib/AST/DeclCXX.cpp @@ -348,8 +348,9 @@ CXXMethodDecl::method_iterator CXXMethodDecl::begin_overridden_methods() const { return 0; OverriddenMethodsMapTy::iterator it = OverriddenMethods->find(this); - if (it == OverriddenMethods->end()) + if (it == OverriddenMethods->end() || it->second->empty()) return 0; + return &(*it->second)[0]; } @@ -358,7 +359,7 @@ CXXMethodDecl::method_iterator CXXMethodDecl::end_overridden_methods() const { return 0; OverriddenMethodsMapTy::iterator it = OverriddenMethods->find(this); - if (it == OverriddenMethods->end()) + if (it == OverriddenMethods->end() || it->second->empty()) return 0; return &(*it->second)[it->second->size()]; |