godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10125 from marcelofg55/fixeditor_crash 

Add missing NULL checks to prevent possible crashes on _add_geometry
This commit is contained in:
Rémi Verschelde 2017-08-07 14:56:43 +02:00 committed by GitHub
parent afcecd63a1 45096ee62c
commit ee7e649e69
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;
}
}
}