Skip to content
Permalink
Browse files

Fix possible NULL dereference in createExtrudedMesh

  • Loading branch information
kahrl committed Jul 6, 2013
1 parent 922a30e commit 3607fae75a00a1d0fee1b5caf58d04dcd9e2bc3a
Showing with 8 additions and 6 deletions.
  1. +8 −6 src/mesh.cpp
@@ -280,15 +280,17 @@ scene::IAnimatedMesh* createExtrudedMesh(video::ITexture *texture,

// img1 is in the texture's color format, convert to 8-bit ARGB
video::IImage *img2 = driver->createImage(video::ECF_A8R8G8B8, size);
if (img2 != NULL)
if (img2 == NULL)
{
img1->copyTo(img2);

mesh = extrudeARGB(size.Width, size.Height, (u8*) img2->lock());
img2->unlock();
img2->drop();
img1->drop();
return NULL;
}

img1->copyTo(img2);
img1->drop();
mesh = extrudeARGB(size.Width, size.Height, (u8*) img2->lock());
img2->unlock();
img2->drop();
}

// Set default material

0 comments on commit 3607fae

Please sign in to comment.