Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-01-13 19:32:41 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

[YAMLParser] Scanner::setError - ensure we use the StringRef::iterator argument (PR45043)

Browse Source 
As detailed on PR45043, static analysis was warning that the StringRef::iterator Position argument was being ignored and the function was hardwired to use the Current iterator.

This patch ensures we use the provided iterator and removes the (barely necessary) setError wrapper that always used Current.

Differential Revision: https://reviews.llvm.org/D76512
This commit is contained in:
Simon Pilgrim 2020-04-03 18:53:38 +01:00
parent ce97ce3a5d
commit 2225797567
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llvm/lib/Support/YAMLParser.cpp
View File

@ -268,8 +268,8 @@ public:
}
void setError(const Twine &Message, StringRef::iterator Position) {
if (Current >= End)
Current = End - 1;
if (Position >= End)
Position = End - 1;
// propagate the error if possible
if (EC)
@ -278,14 +278,10 @@ public:
// Don't print out more errors after the first one we encounter. The rest
// are just the result of the first, and have no meaning.
if (!Failed)
printError(SMLoc::getFromPointer(Current), SourceMgr::DK_Error, Message);
printError(SMLoc::getFromPointer(Position), SourceMgr::DK_Error, Message);
Failed = true;
}
void setError(const Twine &Message) {
setError(Message, Current);
}
/// Returns true if an error occurred while parsing.
bool failed() {
return Failed;
@ -934,13 +930,13 @@ void Scanner::scan_ns_uri_char() {
bool Scanner::consume(uint32_t Expected) {
if (Expected >= 0x80) {
setError("Cannot consume non-ascii characters");
setError("Cannot consume non-ascii characters", Current);
return false;
}
if (Current == End)
return false;
if (uint8_t(*Current) >= 0x80) {
setError("Cannot consume non-ascii characters");
setError("Cannot consume non-ascii characters", Current);
return false;
}
if (uint8_t(*Current) == Expected) {
@ -1763,7 +1759,7 @@ bool Scanner::fetchMoreTokens() {
&& !isBlankOrBreak(Current + 2)))
return scanPlainScalar();
setError("Unrecognized character while tokenizing.");
setError("Unrecognized character while tokenizing.", Current);
return false;
}