asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Add missing NULL checks to prevent possible crashes on _add_geometry

Browse source
This commit is contained in:
Marcelo Fernandez 2017-08-06 10:37:37 -03:00
parent 6a07c98112
commit 45096ee62c
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/gles2/rasterizer_gles2.cpp
View file

@ -4621,16 +4621,19 @@ void RasterizerGLES2::_add_geometry(const Geometry *p_geometry, const InstanceDa
if (duplicate) {
ec = render_list->add_element();
memcpy(ec, e, sizeof(RenderList::Element));
if (ec)
memcpy(ec, e, sizeof(RenderList::Element));
} else {
ec = e;
duplicate = true;
}
ec->light_type = light_type;
ec->light = sort_key;
ec->additive_ptr = &e->additive;
if (ec) {
ec->light_type = light_type;
ec->light = sort_key;
ec->additive_ptr = &e->additive;
}
}
const RID *liptr = p_instance->light_instances.ptr();
@ -4651,16 +4654,18 @@ void RasterizerGLES2::_add_geometry(const Geometry *p_geometry, const InstanceDa
if (duplicate) {
ec = render_list->add_element();
memcpy(ec, e, sizeof(RenderList::Element));
if (ec)
memcpy(ec, e, sizeof(RenderList::Element));
} else {
duplicate = true;
ec = e;
}
ec->light_type = light_type;
ec->light = sort_key;
ec->additive_ptr = &e->additive;
if (ec) {
ec->light_type = light_type;
ec->light = sort_key;
ec->additive_ptr = &e->additive;
}
}
}