diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:58:55 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:58:55 +0200 |
| commit | b79164001d1eb06f4591c59b7a7c2c0fb29e992b (patch) | |
| tree | d211626f0f91a07ac22c1b254a6300bebf732ea6 /nx-X11/programs/Xserver/hw/nxagent/X/NXshm.c | |
| parent | 1c25e92b9ea5811d8ab9c2bfdc0dcb2e4d21bd0a (diff) | |
| download | nx-libs-b79164001d1eb06f4591c59b7a7c2c0fb29e992b.tar.gz nx-libs-b79164001d1eb06f4591c59b7a7c2c0fb29e992b.tar.bz2 nx-libs-b79164001d1eb06f4591c59b7a7c2c0fb29e992b.zip | |
Imported nxagent-3.2.0-5.tar.gznxagent/3.2.0-5
Summary: Imported nxagent-3.2.0-5.tar.gz
Keywords:
Imported nxagent-3.2.0-5.tar.gz
into Git repository
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/X/NXshm.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/X/NXshm.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXshm.c b/nx-X11/programs/Xserver/hw/nxagent/X/NXshm.c index a6d638ea7..e3e4f4b83 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/X/NXshm.c +++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXshm.c @@ -967,17 +967,8 @@ ProcShmPutImage(client) return BadValue; } - /* - * 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; - } + VERIFY_SHMSIZE(shmdesc, stuff->offset, length * stuff->totalHeight, + client); if (stuff->srcX > stuff->totalWidth) { client->errorValue = stuff->srcX; |