[clang] Prevent dangling StringRefs #98699
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
clang
|
@llvm/pr-subscribers-clang Author: Youngsuk Kim (JOE1994) ChangesFix locations where dangling StringRefs are created.
Fixes #98667 Full diff: https://github.com/llvm/llvm-project/pull/98699.diff 1 Files Affected:
diff --git a/clang/lib/Serialization/ASTReaderStmt.cpp b/clang/lib/Serialization/ASTReaderStmt.cpp
index 5a5d7be69a2c3..ecbc57d642ca7 100644
--- a/clang/lib/Serialization/ASTReaderStmt.cpp
+++ b/clang/lib/Serialization/ASTReaderStmt.cpp
@@ -797,10 +797,14 @@ readConstraintSatisfaction(ASTRecordReader &Record) {
if (/* IsDiagnostic */Record.readInt()) {
SourceLocation DiagLocation = Record.readSourceLocation();
std::string DiagMessage = Record.readString();
+ char *DBuf = new (Record.getContext()) char[DiagMessage.size()];
+ std::copy(DiagMessage.begin(), DiagMessage.end(), DBuf);
+
Satisfaction.Details.emplace_back(
- ConstraintExpr, new (Record.getContext())
- ConstraintSatisfaction::SubstitutionDiagnostic{
- DiagLocation, DiagMessage});
+ ConstraintExpr,
+ new (Record.getContext())
+ ConstraintSatisfaction::SubstitutionDiagnostic{
+ DiagLocation, StringRef(DBuf, DiagMessage.size())});
} else
Satisfaction.Details.emplace_back(ConstraintExpr, Record.readExpr());
}
@@ -822,11 +826,18 @@ void ASTStmtReader::VisitConceptSpecializationExpr(
static concepts::Requirement::SubstitutionDiagnostic *
readSubstitutionDiagnostic(ASTRecordReader &Record) {
std::string SubstitutedEntity = Record.readString();
+ char *SBuf = new (Record.getContext()) char[SubstitutedEntity.size()];
+ std::copy(SubstitutedEntity.begin(), SubstitutedEntity.end(), SBuf);
+
SourceLocation DiagLoc = Record.readSourceLocation();
std::string DiagMessage = Record.readString();
+ char *DBuf = new (Record.getContext()) char[DiagMessage.size()];
+ std::copy(DiagMessage.begin(), DiagMessage.end(), DBuf);
+
return new (Record.getContext())
- concepts::Requirement::SubstitutionDiagnostic{SubstitutedEntity, DiagLoc,
- DiagMessage};
+ concepts::Requirement::SubstitutionDiagnostic{
+ StringRef(SBuf, SubstitutedEntity.size()), DiagLoc,
+ StringRef(DBuf, DiagMessage.size())};
}
void ASTStmtReader::VisitRequiresExpr(RequiresExpr *E) {
|
|
@llvm/pr-subscribers-clang-modules Author: Youngsuk Kim (JOE1994) ChangesFix locations where dangling StringRefs are created.
Fixes #98667 Full diff: https://github.com/llvm/llvm-project/pull/98699.diff 1 Files Affected:
diff --git a/clang/lib/Serialization/ASTReaderStmt.cpp b/clang/lib/Serialization/ASTReaderStmt.cpp
index 5a5d7be69a2c3..ecbc57d642ca7 100644
--- a/clang/lib/Serialization/ASTReaderStmt.cpp
+++ b/clang/lib/Serialization/ASTReaderStmt.cpp
@@ -797,10 +797,14 @@ readConstraintSatisfaction(ASTRecordReader &Record) {
if (/* IsDiagnostic */Record.readInt()) {
SourceLocation DiagLocation = Record.readSourceLocation();
std::string DiagMessage = Record.readString();
+ char *DBuf = new (Record.getContext()) char[DiagMessage.size()];
+ std::copy(DiagMessage.begin(), DiagMessage.end(), DBuf);
+
Satisfaction.Details.emplace_back(
- ConstraintExpr, new (Record.getContext())
- ConstraintSatisfaction::SubstitutionDiagnostic{
- DiagLocation, DiagMessage});
+ ConstraintExpr,
+ new (Record.getContext())
+ ConstraintSatisfaction::SubstitutionDiagnostic{
+ DiagLocation, StringRef(DBuf, DiagMessage.size())});
} else
Satisfaction.Details.emplace_back(ConstraintExpr, Record.readExpr());
}
@@ -822,11 +826,18 @@ void ASTStmtReader::VisitConceptSpecializationExpr(
static concepts::Requirement::SubstitutionDiagnostic *
readSubstitutionDiagnostic(ASTRecordReader &Record) {
std::string SubstitutedEntity = Record.readString();
+ char *SBuf = new (Record.getContext()) char[SubstitutedEntity.size()];
+ std::copy(SubstitutedEntity.begin(), SubstitutedEntity.end(), SBuf);
+
SourceLocation DiagLoc = Record.readSourceLocation();
std::string DiagMessage = Record.readString();
+ char *DBuf = new (Record.getContext()) char[DiagMessage.size()];
+ std::copy(DiagMessage.begin(), DiagMessage.end(), DBuf);
+
return new (Record.getContext())
- concepts::Requirement::SubstitutionDiagnostic{SubstitutedEntity, DiagLoc,
- DiagMessage};
+ concepts::Requirement::SubstitutionDiagnostic{
+ StringRef(SBuf, SubstitutedEntity.size()), DiagLoc,
+ StringRef(DBuf, DiagMessage.size())};
}
void ASTStmtReader::VisitRequiresExpr(RequiresExpr *E) {
|
mizvekov
approved these changes
Jul 13, 2024
shafik
requested changes
Jul 13, 2024
There was a problem hiding this comment.
It looks like we are using the same pattern that fix is using in ASTStmtReader::VisitRequiresExpr which gives me some comfort but I am not happy that we have a relatively complex and easy to get wrong operation repeated in three places now. This feel like it should be refactored into common code and if we find a bug w/ it later on fixing it one place will fix all the places.
Fix locations where dangling StringRefs are created. * `ConstraintSatisfaction::SubstitutionDiagnostic`: typedef of `std::pair<SourceLocation, StringRef>` * `concepts::Requirement::SubstitutionDiagnostic`: struct whose 1st and 3rd data members are `StringRef`s Fixes llvm#98667
Add Clang release note item
shafik
reviewed
Jul 16, 2024
sayhaan
pushed a commit
to sayhaan/llvm-project
that referenced
this pull request
Jul 16, 2024
Summary: Fix locations where dangling StringRefs are created. * `ConstraintSatisfaction::SubstitutionDiagnostic`: typedef of `std::pair<SourceLocation, StringRef>` * `concepts::Requirement::SubstitutionDiagnostic`: struct whose 1st and 3rd data members are `StringRef`s Fixes llvm#98667 Test Plan: Reviewers: Subscribers: Tasks: Tags: Differential Revision: https://phabricator.intern.facebook.com/D59822407
yuxuanchen1997
pushed a commit
that referenced
this pull request
Jul 25, 2024
Summary: Fix locations where dangling StringRefs are created. * `ConstraintSatisfaction::SubstitutionDiagnostic`: typedef of `std::pair<SourceLocation, StringRef>` * `concepts::Requirement::SubstitutionDiagnostic`: struct whose 1st and 3rd data members are `StringRef`s Fixes #98667 Test Plan: Reviewers: Subscribers: Tasks: Tags: Differential Revision: https://phabricator.intern.facebook.com/D60251531
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix locations where dangling StringRefs are created.
ConstraintSatisfaction::SubstitutionDiagnostic: typedef ofstd::pair<SourceLocation, StringRef>concepts::Requirement::SubstitutionDiagnostic: struct whose 1st and 3rd data members areStringRefsFixes #98667