aboutsummaryrefslogtreecommitdiff
path: root/libX11/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-07-22 14:48:36 +0200
committermarha <marha@users.sourceforge.net>2013-07-22 14:48:36 +0200
commit81d811ac780a2524fff09a516b6f0212c3f209a2 (patch)
tree0607523b8ebef04e930cdbf538274c59f983cd07 /libX11/src
parentcde797e5f774a44b89e51da0f32472329eac06cb (diff)
parentb6aadb8490bdacf33196fa0898fe1247b9a8ee2c (diff)
downloadvcxsrv-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')
-rw-r--r--libX11/src/Font.c2
-rw-r--r--libX11/src/FontNames.c2
-rw-r--r--libX11/src/GetFPath.c2
-rw-r--r--libX11/src/ListExt.c2
-rw-r--r--libX11/src/ModMap.c2
5 files changed, 5 insertions, 5 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);
diff --git a/libX11/src/FontNames.c b/libX11/src/FontNames.c
index b5bc7b4ba..764711559 100644
--- a/libX11/src/FontNames.c
+++ b/libX11/src/FontNames.c
@@ -66,7 +66,7 @@ int *actualCount) /* RETURN */
if (rep.nFonts) {
flist = Xmalloc (rep.nFonts * sizeof(char *));
- if (rep.length < (LONG_MAX >> 2)) {
+ if (rep.length < (INT_MAX >> 2)) {
rlen = rep.length << 2;
ch = Xmalloc(rlen + 1);
/* +1 to leave room for last null-terminator */
diff --git a/libX11/src/GetFPath.c b/libX11/src/GetFPath.c
index abd4a5dbd..8f8c6144a 100644
--- a/libX11/src/GetFPath.c
+++ b/libX11/src/GetFPath.c
@@ -50,7 +50,7 @@ char **XGetFontPath(
if (rep.nPaths) {
flist = Xmalloc(rep.nPaths * sizeof (char *));
- if (rep.length < (LONG_MAX >> 2)) {
+ if (rep.length < (INT_MAX >> 2)) {
nbytes = (unsigned long) rep.length << 2;
ch = Xmalloc (nbytes + 1);
/* +1 to leave room for last null-terminator */
diff --git a/libX11/src/ListExt.c b/libX11/src/ListExt.c
index e925c4773..59599d1a6 100644
--- a/libX11/src/ListExt.c
+++ b/libX11/src/ListExt.c
@@ -55,7 +55,7 @@ char **XListExtensions(
if (rep.nExtensions) {
list = Xmalloc (rep.nExtensions * sizeof (char *));
- if (rep.length < (LONG_MAX >> 2)) {
+ if (rep.length < (INT_MAX >> 2)) {
rlen = rep.length << 2;
ch = Xmalloc (rlen + 1);
/* +1 to leave room for last null-terminator */
diff --git a/libX11/src/ModMap.c b/libX11/src/ModMap.c
index 5c5b42612..04cd676eb 100644
--- a/libX11/src/ModMap.c
+++ b/libX11/src/ModMap.c
@@ -42,7 +42,7 @@ XGetModifierMapping(register Display *dpy)
GetEmptyReq(GetModifierMapping, req);
(void) _XReply (dpy, (xReply *)&rep, 0, xFalse);
- if (rep.length < (LONG_MAX >> 2)) {
+ if (rep.length < (INT_MAX >> 2)) {
nbytes = (unsigned long)rep.length << 2;
res = Xmalloc(sizeof (XModifierKeymap));
if (res)