ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Lioncash 2015-07-07 18:12:14 -04:00
parent c54534ee3b
commit df379dabae
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/VideoCommon/VertexLoaderBase.cpp
View File

@ -131,13 +131,14 @@ public:
: VertexLoaderBase(vtx_desc, vtx_attr), a(_a), b(_b) : VertexLoaderBase(vtx_desc, vtx_attr), a(_a), b(_b)
{ {
m_initialized = a && b && a->IsInitialized() && b->IsInitialized(); 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 (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_VertexSize = a->m_VertexSize;
m_native_components = a->m_native_components; 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); b->m_VertexSize, b->m_native_components, b->m_native_vtx_decl.stride);
} }
} }
m_initialized &= can_test;
} }
~VertexLoaderTester() override ~VertexLoaderTester() override
{ {