commit 55e4f91258d8d42da3c7a13c295011f63c0aabdd
author Treehugger Robot <treehugger-gerrit@google.com> Thu Dec 15 19:09:39 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 15 19:09:39 2016 +0000
tree 0afec51317e37b6b28432aa203cc13abd0872168
parent a2a7195e232e90a99b88263f2be5b791b03f1c7f
parent d78c2e8a0807ff45db4cb643cc2ef38eafd22551

Merge "libvulkan: add NULL check to DestroySwapchainKHR"

vulkan/libvulkan/swapchain.cpp

diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index 63c597c..da8de11 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -723,6 +723,8 @@
                          const VkAllocationCallbacks* allocator) {
     const auto& dispatch = GetData(device).driver;
     Swapchain* swapchain = SwapchainFromHandle(swapchain_handle);
+    if (!swapchain)
+        return;
     bool active = swapchain->surface.swapchain_handle == swapchain_handle;
     ANativeWindow* window = active ? swapchain->surface.window.get() : nullptr;