replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make sure !empty() before calling String::front(). 

Reviewers: howard.hinnant

Subscribers: cfe-commits

Differential Revision: http://reviews.llvm.org/D9954

llvm-svn: 238263
This commit is contained in:
Chaoren Lin 2015-05-26 23:14:26 +00:00
parent 294c92651c
commit 3abb86da62
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libcxxabi/src/cxa_demangle.cpp
View File

@ -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, ")");