diff options
author | marha <marha@users.sourceforge.net> | 2013-07-22 14:48:36 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-07-22 14:48:36 +0200 |
commit | 81d811ac780a2524fff09a516b6f0212c3f209a2 (patch) | |
tree | 0607523b8ebef04e930cdbf538274c59f983cd07 /libX11/src/Font.c | |
parent | cde797e5f774a44b89e51da0f32472329eac06cb (diff) | |
parent | b6aadb8490bdacf33196fa0898fe1247b9a8ee2c (diff) | |
download | vcxsrv-81d811ac780a2524fff09a516b6f0212c3f209a2.tar.gz vcxsrv-81d811ac780a2524fff09a516b6f0212c3f209a2.tar.bz2 vcxsrv-81d811ac780a2524fff09a516b6f0212c3f209a2.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa git update 22 Jul 2013
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); |