Merge pull request swiftlang#61833 from zoecarver/astgen-fix-int-literal

[astgen] Fix two use-after-frees.
trancaothien · Nov 1, 2022 · 8ca67c7 · 8ca67c7
2 parents a784c00 + 06d6c92
commit 8ca67c7
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/lib/AST/CASTBridging.cpp b/lib/AST/CASTBridging.cpp
@@ -120,17 +120,19 @@ void *SwiftIdentifierExpr_create(void *ctx, BridgedIdentifier base, void *loc) {
 void *SwiftStringLiteralExpr_create(void *ctx, const uint8_t *_Nullable string,
                                     long len, void *TokenLoc) {
   ASTContext &Context = *static_cast<ASTContext *>(ctx);
-  return new (Context) StringLiteralExpr(
-      StringRef{reinterpret_cast<const char *>(string), size_t(len)},
-      getSourceLocFromPointer(TokenLoc));
+  auto stringRef = Context.AllocateCopy(
+      StringRef{reinterpret_cast<const char *>(string), size_t(len)});
+  return new (Context)
+      StringLiteralExpr(stringRef, getSourceLocFromPointer(TokenLoc));
 }
 
 void *SwiftIntegerLiteralExpr_create(void *ctx, const uint8_t *_Nullable string,
                                      long len, void *TokenLoc) {
   ASTContext &Context = *static_cast<ASTContext *>(ctx);
-  return new (Context) IntegerLiteralExpr(
-      StringRef{reinterpret_cast<const char *>(string), size_t(len)},
-      getSourceLocFromPointer(TokenLoc));
+  auto stringRef = Context.AllocateCopy(
+      StringRef{reinterpret_cast<const char *>(string), size_t(len)});
+  return new (Context)
+      IntegerLiteralExpr(stringRef, getSourceLocFromPointer(TokenLoc));
 }
 
 void *SwiftBooleanLiteralExpr_create(void *ctx, bool value, void *TokenLoc) {