From f7283c0e866cd552fcd7d74d2fef4244a26f8b25 Mon Sep 17 00:00:00 2001
From: Mark Lobodzinski <mark@lunarg.com>
Date: Thu, 12 Nov 2015 16:14:04 -0700
Subject: layers: Add missing null-check in DrawState

---
 layers/draw_state.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index fa1cbfaa..a5b42bdc 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -2380,9 +2380,10 @@ VK_LAYER_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkBeginCommandBuffer(VkCommandBuf
         return VK_ERROR_VALIDATION_FAILED;
     }
     VkResult result = dev_data->device_dispatch_table->BeginCommandBuffer(commandBuffer, pBeginInfo);
-    if (VK_SUCCESS == result) {
-        if (CB_NEW != pCB->state)
+    if ((VK_SUCCESS == result) && (pCB != NULL)) {
+        if (CB_NEW != pCB->state) {
             resetCB(dev_data, commandBuffer);
+        }
         pCB->state = CB_UPDATE_ACTIVE;
         updateCBTracking(pCB);
     }
-- 
cgit v1.2.3