diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-29 12:20:21 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-29 12:20:21 +0000 |
| commit | 053f5dfd42ade05252e586a282e34906db10828d (patch) | |
| tree | de215580ce205409a6d810a005c6c5909f3145d1 /xorg-server/render/render.c | |
| parent | 04ceb8c4a0cca3d8682f094d1d6faed8f693afb5 (diff) | |
| parent | 807c6931fe683fd844ceec1b023232181e6aae03 (diff) | |
| download | vcxsrv-053f5dfd42ade05252e586a282e34906db10828d.tar.gz vcxsrv-053f5dfd42ade05252e586a282e34906db10828d.tar.bz2 vcxsrv-053f5dfd42ade05252e586a282e34906db10828d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/render/render.c')
| -rw-r--r-- | xorg-server/render/render.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/render/render.c b/xorg-server/render/render.c index dd143d6a7..9f1b4701f 100644 --- a/xorg-server/render/render.c +++ b/xorg-server/render/render.c @@ -1084,8 +1084,10 @@ ProcRenderAddGlyphs (ClientPtr client) remain -= (sizeof (CARD32) + sizeof (xGlyphInfo)) * nglyphs;
/* protect against bad nglyphs */
- if (gi < stuff || gi > ((CARD32 *)stuff + client->req_len) ||
- bits < stuff || bits > ((CARD32 *)stuff + client->req_len)) {
+ if (gi < ((xGlyphInfo *)stuff) ||
+ gi > ((xGlyphInfo *)((CARD32 *)stuff + client->req_len)) ||
+ bits < ((CARD8 *)stuff) ||
+ bits > ((CARD8 *)((CARD32 *)stuff + client->req_len))) {
err = BadLength;
goto bail;
}
|