aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-08-18 01:55:39 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-08-18 01:55:39 +0000
commitad5c4e359611fc683a535d7167ee87dbe04a264b (patch)
tree384531d05a9f9c655f17de25c5ecafa6f006e923
parentcf3b0c183d9a6910db6384e6f8095c414041ea0c (diff)
parent113e9b1bc146f945274fa5b5088ebf45ea0b37d8 (diff)
downloadandroid_bionic-ad5c4e359611fc683a535d7167ee87dbe04a264b.tar.gz
android_bionic-ad5c4e359611fc683a535d7167ee87dbe04a264b.tar.bz2
android_bionic-ad5c4e359611fc683a535d7167ee87dbe04a264b.zip
Merge "Fix out-of-bounds deque access causing build failure."
-rw-r--r--tools/versioner/src/Preprocessor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/versioner/src/Preprocessor.cpp b/tools/versioner/src/Preprocessor.cpp
index 757a3922c..a7f289b1f 100644
--- a/tools/versioner/src/Preprocessor.cpp
+++ b/tools/versioner/src/Preprocessor.cpp
@@ -300,7 +300,7 @@ static void mergeGuards(std::deque<std::string>& file_lines, GuardMap& guard_map
};
auto nextCol = [&file_lines, &current_location, &nextLine]() {
- if (current_location.column == file_lines[current_location.column - 1].length()) {
+ if (current_location.column == file_lines[current_location.line - 1].length()) {
nextLine();
} else {
++current_location.column;