Add CheckedInt check for GL texture uploads.
parent
c1704fb4fd
commit
6dc3e59b82
|
@ -161,7 +161,22 @@ TexSubImage2DWithoutUnpackSubimage(GLContext* gl,
|
|||
// isn't supported. We make a copy of the texture data we're using,
|
||||
// such that we're using the whole row of data in the copy. This turns
|
||||
// out to be more efficient than uploading row-by-row; see bug 698197.
|
||||
unsigned char* newPixels = new (fallible) unsigned char[width*height*pixelsize];
|
||||
|
||||
// Width and height are never more than 16384. At 16Ki*16Ki, 4Bpp is 1GiB, but
|
||||
// if we allow 8Bpp (16-bit channels, or higher) here, that's 2GiB+, which would
|
||||
// overflow on 32-bit.
|
||||
MOZ_ASSERT(width <= 16384);
|
||||
MOZ_ASSERT(height <= 16384);
|
||||
MOZ_ASSERT(pixelsize < 8);
|
||||
|
||||
const auto size = CheckedInt<size_t>(width) * height * pixelsize;
|
||||
if (!size.isValid()) {
|
||||
// This should never happen, but we use a defensive check.
|
||||
MOZ_ASSERT_UNREACHABLE("Unacceptable size calculated.!");
|
||||
return;
|
||||
}
|
||||
|
||||
unsigned char* newPixels = new (fallible) unsigned char[size.value()];
|
||||
|
||||
if (newPixels) {
|
||||
unsigned char* rowDest = newPixels;
|
||||
|
@ -286,7 +301,22 @@ TexImage2DHelper(GLContext* gl,
|
|||
GLsizei paddedWidth = RoundUpPow2((uint32_t)width);
|
||||
GLsizei paddedHeight = RoundUpPow2((uint32_t)height);
|
||||
|
||||
GLvoid* paddedPixels = new unsigned char[paddedWidth * paddedHeight * pixelsize];
|
||||
// Width and height are never more than 16384. At 16Ki*16Ki, 4Bpp
|
||||
// is 1GiB, but if we allow 8Bpp (or higher) here, that's 2GiB,
|
||||
// which would overflow on 32-bit.
|
||||
MOZ_ASSERT(width <= 16384);
|
||||
MOZ_ASSERT(height <= 16384);
|
||||
MOZ_ASSERT(pixelsize < 8);
|
||||
|
||||
const auto size =
|
||||
CheckedInt<size_t>(paddedWidth) * paddedHeight * pixelsize;
|
||||
if (!size.isValid()) {
|
||||
// This should never happen, but we use a defensive check.
|
||||
MOZ_ASSERT_UNREACHABLE("Unacceptable size calculated.!");
|
||||
return;
|
||||
}
|
||||
|
||||
GLvoid* paddedPixels = new unsigned char[size.value()];
|
||||
|
||||
// Pad out texture data to be in a POT sized buffer for uploading to
|
||||
// a POT sized texture
|
||||
|
@ -465,13 +495,17 @@ UploadImageDataToTexture(GLContext* gl,
|
|||
surfaceFormat = SurfaceFormat::A8;
|
||||
break;
|
||||
default:
|
||||
NS_ASSERTION(false, "Unhandled image surface format!");
|
||||
MOZ_ASSERT_UNREACHABLE(false, "Unhandled image surface format!");
|
||||
}
|
||||
|
||||
if (aOutUploadSize) {
|
||||
*aOutUploadSize = 0;
|
||||
}
|
||||
|
||||
if (surfaceFormat == gfx::SurfaceFormat::UNKNOWN) {
|
||||
return gfx::SurfaceFormat::UNKNOWN;
|
||||
}
|
||||
|
||||
if (aNeedInit || !CanUploadSubTextures(gl)) {
|
||||
// If the texture needs initialized, or we are unable to
|
||||
// upload sub textures, then initialize and upload the entire
|
||||
|
|
Loading…
Reference in New Issue