commit 6ced832d74d9cd86471b0232e69306d21fb56205
author Corentin Wallez <cwallez@chromium.org> Fri May 29 08:04:48 2020 +0000
committer Commit Bot service account <commit-bot@chromium.org> Fri May 29 08:04:48 2020 +0000
tree 92e21f160841202b33c17cc0c1921c312a60e758
parent 0e5301c23ef0e68bd32513658d53d76deca668ab

Fix unlinking nullptr error scopes if device init failed

When device initialization failed, DeviceBase::mCurrentErrorScope is
nullptr so we need to guard the call to UnlinkForShutdown.

Bug: chromium:1081998
Change-Id: I65a1948117fa9461f7fc8d2d1d70aef669bc375d
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/21685
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Stephen White <senorblanco@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

src/dawn_native/Device.cpp

diff --git a/src/dawn_native/Device.cpp b/src/dawn_native/Device.cpp
index db4936a..b3f4766 100644
--- a/src/dawn_native/Device.cpp
+++ b/src/dawn_native/Device.cpp
@@ -154,8 +154,11 @@
         // At this point GPU operations are always finished, so we are in the disconnected state.
         mState = State::Disconnected;
 
+        // mCurrentErrorScope can be null if we failed device initialization.
+        if (mCurrentErrorScope.Get() != nullptr) {
+            mCurrentErrorScope->UnlinkForShutdown();
+        }
         mErrorScopeTracker = nullptr;
-        mCurrentErrorScope->UnlinkForShutdown();
         mFenceSignalTracker = nullptr;
         mDynamicUploader = nullptr;
         mMapRequestTracker = nullptr;