Skip to content
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

Properly escape CSV. #174

Merged
merged 1 commit into from
Sep 1, 2019
Merged

Properly escape CSV. #174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions src/bloaty.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ void CheckedAdd(A* accum, B val) {
#endif
}

std::string CSVEscape(string_view str) {
static std::string CSVEscape(string_view str) {
bool need_escape = false;

for (char ch : str) {
Expand Down Expand Up @@ -801,7 +801,12 @@ void RollupOutput::PrintRowToCSV(const RollupRow& row,
void RollupOutput::PrintTreeToCSV(const RollupRow& row,
std::vector<std::string> parent_labels,
std::ostream* out, bool tabs) const {
parent_labels.push_back(row.name);
if (tabs) {
parent_labels.push_back(row.name);
} else {
parent_labels.push_back(CSVEscape(row.name));
}

if (row.sorted_children.size() > 0) {
for (const auto& child_row : row.sorted_children) {
PrintTreeToCSV(child_row, parent_labels, out, tabs);
Expand Down