From df379dabae6cd214aa56c1fecdb55133249a1847 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 7 Jul 2015 18:12:14 -0400 Subject: [PATCH] VertexLoaderBase: Adjust the scope of a boolean variable if a or b do actually turn out to be null, this can cause a null pointer dereference. --- Source/Core/VideoCommon/VertexLoaderBase.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Source/Core/VideoCommon/VertexLoaderBase.cpp b/Source/Core/VideoCommon/VertexLoaderBase.cpp index d5831bc8e5..7f8134b85b 100644 --- a/Source/Core/VideoCommon/VertexLoaderBase.cpp +++ b/Source/Core/VideoCommon/VertexLoaderBase.cpp @@ -131,13 +131,14 @@ public: : VertexLoaderBase(vtx_desc, vtx_attr), a(_a), b(_b) { m_initialized = a && b && a->IsInitialized() && b->IsInitialized(); - bool can_test = a->m_VertexSize == b->m_VertexSize && - a->m_native_components == b->m_native_components && - a->m_native_vtx_decl.stride == b->m_native_vtx_decl.stride; if (m_initialized) { - if (can_test) + m_initialized = a->m_VertexSize == b->m_VertexSize && + a->m_native_components == b->m_native_components && + a->m_native_vtx_decl.stride == b->m_native_vtx_decl.stride; + + if (m_initialized) { m_VertexSize = a->m_VertexSize; m_native_components = a->m_native_components; @@ -152,8 +153,6 @@ public: b->m_VertexSize, b->m_native_components, b->m_native_vtx_decl.stride); } } - - m_initialized &= can_test; } ~VertexLoaderTester() override {