aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/Xext/shm.c
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2011-10-10 17:47:30 +0200
committerReinhard Tartler <siretart@tauware.de>2011-10-10 17:47:30 +0200
commit30463b084b2833193aa6fdc2ceafefc8a1c06fee (patch)
treefd062f7ac7b98d742a781d5f95e59cbb38fb81bc /nx-X11/programs/Xserver/Xext/shm.c
parent713da22603c4abc7a97feddd931f29c507b7984b (diff)
downloadnx-libs-30463b084b2833193aa6fdc2ceafefc8a1c06fee.tar.gz
nx-libs-30463b084b2833193aa6fdc2ceafefc8a1c06fee.tar.bz2
nx-libs-30463b084b2833193aa6fdc2ceafefc8a1c06fee.zip
Imported nx-X11-3.2.0-2.tar.gznx-X11/3.2.0-2
Summary: Imported nx-X11-3.2.0-2.tar.gz Keywords: Imported nx-X11-3.2.0-2.tar.gz into Git repository
Diffstat (limited to 'nx-X11/programs/Xserver/Xext/shm.c')
-rw-r--r--nx-X11/programs/Xserver/Xext/shm.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c
index e2cf8cd24..f25bb9b5d 100644
--- a/nx-X11/programs/Xserver/Xext/shm.c
+++ b/nx-X11/programs/Xserver/Xext/shm.c
@@ -863,8 +863,17 @@ ProcShmPutImage(client)
return BadValue;
}
- VERIFY_SHMSIZE(shmdesc, stuff->offset, length * stuff->totalHeight,
- client);
+ /*
+ * There's a potential integer overflow in this check:
+ * VERIFY_SHMSIZE(shmdesc, stuff->offset, length * stuff->totalHeight,
+ * client);
+ * the version below ought to avoid it
+ */
+ if (stuff->totalHeight != 0 &&
+ length > (shmdesc->size - stuff->offset)/stuff->totalHeight) {
+ client->errorValue = stuff->totalWidth;
+ return BadValue;
+ }
if (stuff->srcX > stuff->totalWidth)
{
client->errorValue = stuff->srcX;