Skip to content

Add extra checks to demangler_one #412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Add extra checks to demangler_one #412

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6f53a9
Don't crash in demangler_one on unexpected input
vonosmas Jan 8, 2016
22b0b06
Revert to original functions
vonosmas Jan 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,14 @@ using namespace Rcpp;
static std::string demangler_one(const char* input) {
static std::string buffer;
buffer = input;
buffer.resize(buffer.find_last_of('+') - 1);
buffer.erase(
buffer.begin(),
buffer.begin() + buffer.find_last_of(' ') + 1
);
const auto last_plus = buffer.find_last_of('+');
if (last_plus != std::string::npos) {
buffer.resize(last_plus - 1);
}
const auto last_space = buffer.find_last_of(' ');
if (last_space != std::string::npos) {
buffer.erase(buffer.begin(), buffer.begin() + last_space + 1);
}
return demangle(buffer);
}

Expand Down