maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix use-after-free detected by ASan bootstrap. 

llvm-svn: 203140
This commit is contained in:
Richard Smith 2014-03-06 18:08:08 +00:00
parent 9b5256c566
commit 6f548ec37e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang/lib/Lex/HeaderSearch.cpp
View File

@ -603,10 +603,14 @@ const FileEntry *HeaderSearch::LookupFile(
TmpDir.push_back('/');
TmpDir.append(Filename.begin(), Filename.end());
HeaderFileInfo &FromHFI = getFileInfo(Includer);
// FIXME: We don't cache the result of getFileInfo across the call to
// getFileAndSuggestModule, because it's a reference to an element of
// a container that could be reallocated across this call.
bool IncluderIsSystemHeader =
getFileInfo(Includer).DirInfo != SrcMgr::C_User;
if (const FileEntry *FE =
getFileAndSuggestModule(*this, TmpDir.str(), Includer->getDir(),
FromHFI.DirInfo != SrcMgr::C_User,
IncluderIsSystemHeader,
SuggestedModule)) {
// Leave CurDir unset.
// This file is a system header or C++ unfriendly if the old file is.
@ -614,6 +618,7 @@ const FileEntry *HeaderSearch::LookupFile(
// Note that we only use one of FromHFI/ToHFI at once, due to potential
// reallocation of the underlying vector potentially making the first
// reference binding dangling.
HeaderFileInfo &FromHFI = getFileInfo(Includer);
unsigned DirInfo = FromHFI.DirInfo;
bool IndexHeaderMapHeader = FromHFI.IndexHeaderMapHeader;
StringRef Framework = FromHFI.Framework;