commit 880ecee177c8e94af11410bd2ecb07d5e62e0235
author Jiawei Shao <jiawei.shao@intel.com> Tue Apr 02 00:43:00 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Apr 02 00:43:00 2024 +0000
tree ac5633db78ee5694cb5adb74a71fc8155f24c39b
parent c04f42006b5bd826bc8c184d3c7377742f915ec3

Fix dangling pointer in BufferBase

Bug: dawn:2349
Test: dawn_end2end_tests
Change-Id: I3089e15de1ac4081742d26123b62cfbe9b0c2f59
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/181641
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Jiawei Shao <jiawei.shao@intel.com>

src/dawn/native/Buffer.cpp

diff --git a/src/dawn/native/Buffer.cpp b/src/dawn/native/Buffer.cpp
index 9ce0de9..c24f320 100644
--- a/src/dawn/native/Buffer.cpp
+++ b/src/dawn/native/Buffer.cpp
@@ -512,7 +512,7 @@
 
     if (mMapCallback != nullptr && mapID == mLastMapID) {
         auto callback = std::move(mMapCallback);
-        auto userdata = std::move(mMapUserdata);
+        void* userdata = std::move(mMapUserdata);
         WGPUBufferMapAsyncStatus actualStatus;
         if (GetDevice()->IsLost()) {
             actualStatus = WGPUBufferMapAsyncStatus_DeviceLost;

src/dawn/native/Buffer.h

diff --git a/src/dawn/native/Buffer.h b/src/dawn/native/Buffer.h
index 3e755022..401ff66 100644
--- a/src/dawn/native/Buffer.h
+++ b/src/dawn/native/Buffer.h
@@ -179,8 +179,7 @@
     Ref<BufferBase> mStagingBuffer;
 
     WGPUBufferMapCallback mMapCallback = nullptr;
-    // TODO(https://crbug.com/dawn/2349): Investigate DanglingUntriaged in dawn/native.
-    raw_ptr<void, DanglingUntriaged> mMapUserdata = nullptr;
+    raw_ptr<void> mMapUserdata = nullptr;
     MapRequestID mLastMapID = MapRequestID(0);
     wgpu::MapMode mMapMode = wgpu::MapMode::None;
     size_t mMapOffset = 0;