Oblomov
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix possible NULL dereference in createExtrudedMesh

master
Kahrl 2013-07-06 06:16:51 +02:00
parent 922a30ee47
commit 3607fae75a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mesh.cpp
View File

@ -280,16 +280,18 @@ scene::IAnimatedMesh* createExtrudedMesh(video::ITexture *texture,
// img1 is in the texture's color format, convert to 8-bit ARGB // img1 is in the texture's color format, convert to 8-bit ARGB
video::IImage *img2 = driver->createImage(video::ECF_A8R8G8B8, size); video::IImage *img2 = driver->createImage(video::ECF_A8R8G8B8, size);
if (img2 != NULL) if (img2 == NULL)
{ {
img1->copyTo(img2); img1->drop();
return NULL;
}
img1->copyTo(img2);
img1->drop();
mesh = extrudeARGB(size.Width, size.Height, (u8*) img2->lock()); mesh = extrudeARGB(size.Width, size.Height, (u8*) img2->lock());
img2->unlock(); img2->unlock();
img2->drop(); img2->drop();
} }
img1->drop();
}
// Set default material // Set default material
mesh->getMeshBuffer(0)->getMaterial().setTexture(0, texture); mesh->getMeshBuffer(0)->getMaterial().setTexture(0, texture);