[llvm] eabf1d3 - [RISCV] check pointer before dereference
Piyou Chen via llvm-commits
llvm-commits at lists.llvm.org
Wed May 31 21:35:12 PDT 2023
Author: Piyou Chen
Date: 2023-05-31T21:35:07-07:00
New Revision: eabf1d367f661bda1ab1a075e5382769e9cfefcf
URL: https://github.com/llvm/llvm-project/commit/eabf1d367f661bda1ab1a075e5382769e9cfefcf
DIFF: https://github.com/llvm/llvm-project/commit/eabf1d367f661bda1ab1a075e5382769e9cfefcf.diff
LOG: [RISCV] check pointer before dereference
Encountered ASAN crash and found it dereference without check pointer.
Reviewed By: kito-cheng, eklepilkina
Differential Revision: https://reviews.llvm.org/D151716
Added:
Modified:
llvm/lib/Support/RISCVISAInfo.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Support/RISCVISAInfo.cpp b/llvm/lib/Support/RISCVISAInfo.cpp
index c5b42840b688..4e4a5c04bfe8 100644
--- a/llvm/lib/Support/RISCVISAInfo.cpp
+++ b/llvm/lib/Support/RISCVISAInfo.cpp
@@ -699,9 +699,10 @@ RISCVISAInfo::parseArchString(StringRef Arch, bool EnableExperimentalExtension,
auto StdExtsItr = StdExts.begin();
auto StdExtsEnd = StdExts.end();
- auto GoToNextExt = [](StringRef::iterator &I, unsigned ConsumeLength) {
+ auto GoToNextExt = [](StringRef::iterator &I, unsigned ConsumeLength,
+ StringRef::iterator E) {
I += 1 + ConsumeLength;
- if (*I == '_')
+ if (I != E && *I == '_')
++I;
};
for (auto I = Exts.begin(), E = Exts.end(); I != E;) {
@@ -737,7 +738,7 @@ RISCVISAInfo::parseArchString(StringRef Arch, bool EnableExperimentalExtension,
ExperimentalExtensionVersionCheck)) {
if (IgnoreUnknown) {
consumeError(std::move(E));
- GoToNextExt(I, ConsumeLength);
+ GoToNextExt(I, ConsumeLength, Exts.end());
continue;
}
return std::move(E);
@@ -747,7 +748,7 @@ RISCVISAInfo::parseArchString(StringRef Arch, bool EnableExperimentalExtension,
// Currently LLVM supports only "mafdcvh".
if (!isSupportedExtension(StringRef(&C, 1))) {
if (IgnoreUnknown) {
- GoToNextExt(I, ConsumeLength);
+ GoToNextExt(I, ConsumeLength, Exts.end());
continue;
}
return createStringError(errc::invalid_argument,
@@ -758,7 +759,7 @@ RISCVISAInfo::parseArchString(StringRef Arch, bool EnableExperimentalExtension,
// Consume full extension name and version, including any optional '_'
// between this extension and the next
- GoToNextExt(I, ConsumeLength);
+ GoToNextExt(I, ConsumeLength, Exts.end());
}
// Handle other types of extensions other than the standard
More information about the llvm-commits
mailing list