diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-22 14:47:25 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-22 14:47:25 +0200 |
| commit | b6aadb8490bdacf33196fa0898fe1247b9a8ee2c (patch) | |
| tree | fd3eb9fb24cac7733fa7b8afab87fa6e46247c02 /libX11/src/Font.c | |
| parent | 89bc3ee988b62eb5e10284bac32a176955546410 (diff) | |
| download | vcxsrv-b6aadb8490bdacf33196fa0898fe1247b9a8ee2c.tar.gz vcxsrv-b6aadb8490bdacf33196fa0898fe1247b9a8ee2c.tar.bz2 vcxsrv-b6aadb8490bdacf33196fa0898fe1247b9a8ee2c.zip | |
libX11 mesa git update 22 Jul 2013
libX11 commit 24d3ee0d08f24e23c91d55702f010f73d7b908e5
mesa commit 190312949e8ce2c1dc884d4db5d6a44511666641
Diffstat (limited to 'libX11/src/Font.c')
| -rw-r--r-- | libX11/src/Font.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libX11/src/Font.c b/libX11/src/Font.c index a32f740bd..ac1802428 100644 --- a/libX11/src/Font.c +++ b/libX11/src/Font.c @@ -588,7 +588,7 @@ _XF86BigfontQueryFont ( if (!(extcodes->serverCapabilities & CAP_VerifiedLocal)) { struct shmid_ds buf; if (!(shmctl(reply.shmid, IPC_STAT, &buf) >= 0 - && reply.nCharInfos < (LONG_MAX / sizeof(XCharStruct)) + && reply.nCharInfos < (INT_MAX / sizeof(XCharStruct)) && buf.shm_segsz >= reply.shmsegoffset + reply.nCharInfos * sizeof(XCharStruct) + sizeof(CARD32) && *(CARD32 *)(addr + reply.shmsegoffset + reply.nCharInfos * sizeof(XCharStruct)) == extcodes->serverSignature)) { shmdt(addr); |