diff options
| author | Jan Korous <jkorous@apple.com> | 2020-08-18 22:36:16 -0700 |
|---|---|---|
| committer | Jan Korous <jkorous@apple.com> | 2020-09-15 15:54:16 -0700 |
| commit | ae726fecae9a1cc9c50de5a9f6e860056f82c556 (patch) | |
| tree | c3b01e1faf405cbf56d889565cf3e2d34377a0fb /clang/lib/Basic/SourceManager.cpp | |
| parent | a4e35cc2ec1036832e7626191f8b9f0e3169477c (diff) | |
| download | llvm-ae726fecae9a1cc9c50de5a9f6e860056f82c556.zip llvm-ae726fecae9a1cc9c50de5a9f6e860056f82c556.tar.gz llvm-ae726fecae9a1cc9c50de5a9f6e860056f82c556.tar.bz2 | |
[SourceManager] Explicitly check for potential iterator underflow
Differential Revision: https://reviews.llvm.org/D86231
Diffstat (limited to 'clang/lib/Basic/SourceManager.cpp')
| -rw-r--r-- | clang/lib/Basic/SourceManager.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/clang/lib/Basic/SourceManager.cpp b/clang/lib/Basic/SourceManager.cpp index 0a76c78..0f19440 100644 --- a/clang/lib/Basic/SourceManager.cpp +++ b/clang/lib/Basic/SourceManager.cpp @@ -1936,6 +1936,11 @@ SourceManager::getMacroArgExpandedLocation(SourceLocation Loc) const { assert(!MacroArgsCache->empty()); MacroArgsMap::iterator I = MacroArgsCache->upper_bound(Offset); + // In case every element in MacroArgsCache is greater than Offset we can't + // decrement the iterator. + if (I == MacroArgsCache->begin()) + return Loc; + --I; unsigned MacroArgBeginOffs = I->first; |