Make sure the DisplayImpl is terminated if it fails to fully initialize.

It is possible that if device creation fails that the display would be left in a state where rx::DisplayImpl is initialized and egl::Display is not. BUG=angleproject:2546 Change-Id: I609e4c40f37945322d64786d4f6e97f361764b62 Reviewed-on: https://chromium-review.googlesource.com/1066501 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Make sure the DisplayImpl is terminated if it fails to fully initialize.
671be629 · Geoff Lang · Commit Bot · 534b00db · 671be629
Commit 671be629 authored May 18, 2018 by Geoff Lang Committed by Commit Bot May 22, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

Display.cpp src/libANGLE/Display.cpp +8 -1

No files found.
--- a/src/libANGLE/Display.cpp
+++ b/src/libANGLE/Display.cpp
@@ -499,7 +499,14 @@ Error Display::initialize()
        {
            std::unique_ptr<rx::DeviceImpl> impl(mImplementation->createDevice());
            ASSERT(impl != nullptr);
-            ANGLE_TRY(impl->initialize());
+            error = impl->initialize();
+            if (error.isError())
+            {
+                ERR() << "Failed to initialize display because device creation failed: "
+                      << error.getMessage();
+                mImplementation->terminate();
+                return error;
+            }
            mDevice = new Device(this, impl.release());
        }
        else