diff options
| author | Chaoren Lin <chaorenl@google.com> | 2015-05-26 23:14:26 +0000 |
|---|---|---|
| committer | Chaoren Lin <chaorenl@google.com> | 2015-05-26 23:14:26 +0000 |
| commit | 3abb86da627a01b1e2091c08a9117dc273f9473f (patch) | |
| tree | 4bebb3d811305c201f39a2d338d56221d4e69c73 /libcxxabi/src | |
| parent | 294c92651c6ec18d24137832156070f09b93354d (diff) | |
| download | bcm5719-llvm-3abb86da627a01b1e2091c08a9117dc273f9473f.tar.gz bcm5719-llvm-3abb86da627a01b1e2091c08a9117dc273f9473f.zip | |
Make sure !empty() before calling String::front().
Reviewers: howard.hinnant
Subscribers: cfe-commits
Differential Revision: http://reviews.llvm.org/D9954
llvm-svn: 238263
Diffstat (limited to 'libcxxabi/src')
| -rw-r--r-- | libcxxabi/src/cxa_demangle.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libcxxabi/src/cxa_demangle.cpp b/libcxxabi/src/cxa_demangle.cpp index 3bf3af9924e..d80843e3eb1 100644 --- a/libcxxabi/src/cxa_demangle.cpp +++ b/libcxxabi/src/cxa_demangle.cpp @@ -1671,7 +1671,7 @@ parse_pointer_to_member_type(const char* first, const char* last, C& db) auto func = std::move(db.names.back()); db.names.pop_back(); auto class_type = std::move(db.names.back()); - if (func.second.front() == '(') + if (!func.second.empty() && func.second.front() == '(') { db.names.back().first = std::move(func.first) + "(" + class_type.move_full() + "::*"; db.names.back().second = ")" + std::move(func.second); @@ -2018,7 +2018,8 @@ parse_type(const char* first, const char* last, C& db) db.names[k].first += " ("; db.names[k].second.insert(0, ")"); } - else if (db.names[k].second.front() == '(') + else if (!db.names[k].second.empty() && + db.names[k].second.front() == '(') { db.names[k].first += "("; db.names[k].second.insert(0, ")"); @@ -2045,7 +2046,8 @@ parse_type(const char* first, const char* last, C& db) db.names[k].first += " ("; db.names[k].second.insert(0, ")"); } - else if (db.names[k].second.front() == '(') + else if (!db.names[k].second.empty() && + db.names[k].second.front() == '(') { db.names[k].first += "("; db.names[k].second.insert(0, ")"); @@ -2079,7 +2081,8 @@ parse_type(const char* first, const char* last, C& db) db.names[k].first += " ("; db.names[k].second.insert(0, ")"); } - else if (db.names[k].second.front() == '(') + else if (!db.names[k].second.empty() && + db.names[k].second.front() == '(') { db.names[k].first += "("; db.names[k].second.insert(0, ")"); |
