Skip to content

Avoid a potential use-after-free by storing a std::string (NFC) #7111

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

Merged
merged 1 commit into from
Jul 28, 2023
Merged

Avoid a potential use-after-free by storing a std::string (NFC) #7111

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
32 changes: 15 additions & 17 deletions lldb/source/Plugins/TypeSystem/Swift/StoringDiagnosticConsumer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ class StoringDiagnosticConsumer : public swift::DiagnosticConsumer {
formatted_text = !s.empty() ? std::move(s) : std::string(text);
}
RawDiagnostic diagnostic(
formatted_text, info.Kind, bufferName, bufferID, line_col.first,
formatted_text, info.Kind, bufferName.str(), bufferID, line_col.first,
line_col.second,
use_fixits ? info.FixIts : llvm::ArrayRef<swift::Diagnostic::FixIt>());
if (info.ID == swift::diag::error_from_clang.ID ||
Expand Down Expand Up @@ -287,8 +287,7 @@ class StoringDiagnosticConsumer : public swift::DiagnosticConsumer {

// Need to remap the error/warning to a different line.
StreamString match;
match.Printf("%s:%u:", diagnostic.bufferName.str().c_str(),
diagnostic.line);
match.Printf("%s:%u:", diagnostic.bufferName.c_str(), diagnostic.line);
const size_t match_len = match.GetString().size();
size_t match_pos = diagnostic.description.find(match.GetString().str());
if (match_pos == std::string::npos)
Expand All @@ -302,7 +301,7 @@ class StoringDiagnosticConsumer : public swift::DiagnosticConsumer {
fixed_description.Printf(
"%s",
diagnostic.description.substr(start_pos, match_pos).c_str());
fixed_description.Printf("%s:%u:", diagnostic.bufferName.str().c_str(),
fixed_description.Printf("%s:%u:", diagnostic.bufferName.c_str(),
diagnostic.line - first_line + 1);
start_pos = match_pos + match_len;
match_pos =
Expand Down Expand Up @@ -373,30 +372,29 @@ class StoringDiagnosticConsumer : public swift::DiagnosticConsumer {
struct RawDiagnostic {
RawDiagnostic() = default;
RawDiagnostic(std::string in_desc, swift::DiagnosticKind in_kind,
llvm::StringRef in_bufferName, unsigned in_bufferID,
std::string in_bufferName, unsigned in_bufferID,
uint32_t in_line, uint32_t in_column,
llvm::ArrayRef<swift::Diagnostic::FixIt> in_fixits)
: description(in_desc), kind(in_kind), bufferName(in_bufferName),
bufferID(in_bufferID), line(in_line), column(in_column),
fixits(in_fixits) {}
RawDiagnostic(const RawDiagnostic &other)
: description(other.description), kind(other.kind),
bufferName(other.bufferName), bufferID(other.bufferID),
line(other.line), column(other.column), fixits(other.fixits) {}
: description(in_desc), bufferName(in_bufferName), fixits(in_fixits),
kind(in_kind), bufferID(in_bufferID), line(in_line),
column(in_column) {}
RawDiagnostic(const RawDiagnostic &other) = default;
bool operator==(const RawDiagnostic& other) {
return kind == other.kind && bufferID == other.bufferID &&
line == other.line && column == other.column &&
description == other.description;
return kind == other.kind && line == other.line &&
bufferID == other.bufferID && column == other.column &&
bufferName == other.bufferName && description == other.description;
}
bool operator!=(const RawDiagnostic &other) { return !(*this == other); }

std::string description;
std::string bufferName;
std::vector<swift::DiagnosticInfo::FixIt> fixits;
swift::DiagnosticKind kind = swift::DiagnosticKind::Error;
llvm::StringRef bufferName;
/// Only stored for comparison in HandleDiagnostic. There is no
/// guarantee that the SourceMgr is still alive in a stored diagnostic.
unsigned bufferID;
uint32_t line;
uint32_t column;
std::vector<swift::DiagnosticInfo::FixIt> fixits;
};

SwiftASTContext &m_ast_context;
Expand Down