commit dd63b665bda25735b7a76b658e8dcb154cfb296d
author Jiawei Shao <jiawei.shao@intel.com> Thu Apr 11 06:17:01 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Apr 11 06:17:01 2024 +0000
tree 7901bb1d24900a1eb18e7ccb6888545d9d8d9f73
parent a79a81394ea6f08128b6900d23ce95f3918a3bf4

dawn/test: Fix dangling pointer in VulkanImageWrappingTests

This patch fixes dangling pointer on
`VulkanImageWrappingTestBase::defaultTexture` by always clearing
`defaultTexture` before `testTextures` (`defaultTexture` is always
pointing to `testTextures[0]`).

Bug: dawn:2346
Change-Id: Ieee0c2da7d6880ae1ae6d164d72390834fb5958e
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/183364
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>

src/dawn/tests/white_box/VulkanImageWrappingTests.cpp

diff --git a/src/dawn/tests/white_box/VulkanImageWrappingTests.cpp b/src/dawn/tests/white_box/VulkanImageWrappingTests.cpp
index 5332584..a216382 100644
--- a/src/dawn/tests/white_box/VulkanImageWrappingTests.cpp
+++ b/src/dawn/tests/white_box/VulkanImageWrappingTests.cpp
@@ -119,8 +119,8 @@
             return;
         }
 
-        testTextures = {};
         defaultTexture = nullptr;
+        testTextures = {};
         mBackend = nullptr;
         DawnTestWithParams::TearDown();
     }
@@ -187,8 +187,7 @@
 
     wgpu::TextureDescriptor defaultDescriptor;
     std::array<std::unique_ptr<ExternalTexture>, kTestTexturesCount> testTextures;
-    // TODO(https://crbug.com/dawn/2346): Investigate `DanglingUntriaged` pointers in dawn/test.
-    raw_ptr<ExternalTexture, DanglingUntriaged> defaultTexture;
+    raw_ptr<ExternalTexture> defaultTexture;
 };
 
 using VulkanImageWrappingValidationTests = VulkanImageWrappingTestBase;