fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 02:38:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

try removing need for the uintptr_t casts

Browse source
This commit is contained in:
Brian Paul 2005-12-01 00:59:51 +00:00
parent 0e31e02aef
commit 6b25193b92
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mesa/main/bufferobj.c
View file

@ -433,6 +433,7 @@ _mesa_validate_pbo_access(GLuint dimensions,
GLenum format, GLenum type, const GLvoid *ptr)
{
GLvoid *start, *end;
const GLubyte *sizeAddr; /* buffer size, cast to a pointer */
ASSERT(pack->BufferObj->Name != 0);
@ -449,11 +450,13 @@ _mesa_validate_pbo_access(GLuint dimensions,
format, type, depth-1, height-1, width);
if ((const GLubyte *) start > (const GLubyte *)(uintptr_t) pack->BufferObj->Size) {
sizeAddr = ((const GLubyte *) 0) + pack->BufferObj->Size;
if ((const GLubyte *) start > sizeAddr) {
/* This will catch negative values / wrap-around */
return GL_FALSE;
}
if ((const GLubyte *) end > (const GLubyte *)(uintptr_t) pack->BufferObj->Size) {
if ((const GLubyte *) end > sizeAddr) {
/* Image read goes beyond end of buffer */
return GL_FALSE;
}