[clang-format] Fix use after free in FormatTokenSource test

Add a lifetime annotation to IndexedTokenSource so we get a warning for this pattern.
llvm · Jan 31, 2023 · ffc9b80 · ffc9b80
1 parent eb6f5f1
commit ffc9b80
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/clang/lib/Format/FormatTokenSource.h b/clang/lib/Format/FormatTokenSource.h
@@ -52,7 +52,7 @@ class FormatTokenSource {
   virtual FormatToken *setPosition(unsigned Position) = 0;
 };
 
-class IndexedTokenSource : public FormatTokenSource {
+class LLVM_GSL_POINTER IndexedTokenSource : public FormatTokenSource {
 public:
   IndexedTokenSource(ArrayRef<FormatToken *> Tokens)
       : Tokens(Tokens), Position(-1) {}
@@ -198,4 +198,4 @@ class ScopedMacroState : public FormatTokenSource {
 
 #undef DEBUG_TYPE
 
-#endif
+#endif
diff --git a/clang/unittests/Format/FormatTokenSourceTest.cpp b/clang/unittests/Format/FormatTokenSourceTest.cpp
@@ -32,7 +32,8 @@ class IndexedTokenSourceTest : public ::testing::Test {
   } while (false);
 
 TEST_F(IndexedTokenSourceTest, EmptyInput) {
-  IndexedTokenSource Source(lex(""));
+  TokenList Tokens = lex("");
+  IndexedTokenSource Source(Tokens);
   EXPECT_FALSE(Source.isEOF());
   EXPECT_TOKEN_KIND(Source.getNextToken(), tok::eof);
   EXPECT_TRUE(Source.isEOF());
@@ -45,7 +46,8 @@ TEST_F(IndexedTokenSourceTest, EmptyInput) {
 }
 
 TEST_F(IndexedTokenSourceTest, NavigateTokenStream) {
-  IndexedTokenSource Source(lex("int a;"));
+  TokenList Tokens = lex("int a;");
+  IndexedTokenSource Source(Tokens);
   EXPECT_TOKEN_KIND(Source.peekNextToken(), tok::kw_int);
   EXPECT_TOKEN_KIND(Source.getNextToken(), tok::kw_int);
   EXPECT_EQ(Source.getPreviousToken(), nullptr);
@@ -61,7 +63,8 @@ TEST_F(IndexedTokenSourceTest, NavigateTokenStream) {
 }
 
 TEST_F(IndexedTokenSourceTest, ResetPosition) {
-  IndexedTokenSource Source(lex("int a;"));
+  TokenList Tokens = lex("int a;");
+  IndexedTokenSource Source(Tokens);
   Source.getNextToken();
   unsigned Position = Source.getPosition();
   Source.getNextToken();
@@ -72,4 +75,4 @@ TEST_F(IndexedTokenSourceTest, ResetPosition) {
 
 } // namespace
 } // namespace format
-} // namespace clang
+} // namespace clang