GRAPHICS: Add some extra sanity checks when loading images

xoreos · Mar 20, 2014 · ca4a69c · ca4a69c
1 parent c2191f5
commit ca4a69c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/graphics/textureman.cpp b/src/graphics/textureman.cpp
@@ -334,9 +334,12 @@ void TextureManager::convert(Ogre::TexturePtr &texture, const ImageDecoder &imag
 			if (Ogre::PixelUtil::isCompressed(formatFrom) != Ogre::PixelUtil::isCompressed(formatTo))
 				throw Common::Exception("Can't convert between compressed and non-compressed pixel formats");
 
+			if (Ogre::PixelUtil::isCompressed(formatFrom) && (formatFrom != formatTo))
+				throw Common::Exception("Can't convert between different compressed pixel formats");
+
 			// OGRE segfaults when using bulkPixelConversion() to copy compressed formats
 			if (Ogre::PixelUtil::isCompressed(formatFrom))
-				memcpy(dst, src, mipMap.size);
+				memcpy(dst, src, MIN<uint32>(mipMap.size, buffer->getSizeInBytes()));
 			else
 				// TODO: This is probably really slow...
 				Ogre::PixelUtil::bulkPixelConversion(src, formatFrom, dst, formatTo, pixels);