Merge pull request #1921 from bnbarham/benb/cherry-pick-b89f7e8

bnbarham · web-flow · commit c17f50a45bb0 · 2020-10-08T13:21:35.000+10:00
[clang][Index] Add guard to IndexUnitReader module name reading
diff --git a/clang/lib/Index/IndexUnitReader.cpp b/clang/lib/Index/IndexUnitReader.cpp
@@ -378,10 +378,10 @@ void IndexUnitReaderImpl::constructFilePath(SmallVectorImpl<char> &PathBuf,
 }
 
 StringRef IndexUnitReaderImpl::getModuleName(int ModuleIndex) {
-  if (ModuleIndex < 0)
+  if (ModuleIndex < 0 || ModuleNamesBuffer.empty())
     return StringRef();
   auto &ModInfo = Modules[ModuleIndex];
-  return StringRef(ModuleNamesBuffer.data()+ModInfo.NameOffset, ModInfo.NameSize);
+  return ModuleNamesBuffer.substr(ModInfo.NameOffset, ModInfo.NameSize);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -378,10 +378,10 @@ void IndexUnitReaderImpl::constructFilePath(SmallVectorImpl<char> &PathBuf,`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`StringRef IndexUnitReaderImpl::getModuleName(int ModuleIndex) {`
`381`		`- if (ModuleIndex < 0)`
	`381`	`+ if (ModuleIndex < 0 \|\| ModuleNamesBuffer.empty())`
`382`	`382`	`return StringRef();`
`383`	`383`	`auto &ModInfo = Modules[ModuleIndex];`
`384`		`- return StringRef(ModuleNamesBuffer.data()+ModInfo.NameOffset, ModInfo.NameSize);`
	`384`	`+ return ModuleNamesBuffer.substr(ModInfo.NameOffset, ModInfo.NameSize);`
`385`	`385`	`}`
`386`	`386`
`387`	`387`