Attachment 150431 Details for Bug 232996 – Poposed upstream patch

[patch] Poposed upstream patch

xcmisc.diff (text/plain), 1.05 KB, created by Josh Bressers on 2007-03-19 20:10:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josh Bressers

Created: 2007-03-19 20:10:32 UTC

Size: 1.05 KB

patch

obsolete

>Index: Xext/xcmisc.c
>===================================================================
>RCS file: /cvs/xenocara/xserver/Xext/xcmisc.c,v
>retrieving revision 1.1.1.1
>diff -u -r1.1.1.1 xcmisc.c
>--- Xext/xcmisc.c	26 Nov 2006 18:14:51 -0000	1.1.1.1
>+++ Xext/xcmisc.c	16 Feb 2007 21:59:51 -0000
>@@ -42,6 +42,12 @@
> #include <X11/extensions/xcmiscstr.h>
> #include "modinit.h"
> 
>+#if HAVE_STDINT_H
>+#include <stdint.h>
>+#elif !defined(UINT32_MAX)
>+#define UINT32_MAX 0xffffffffU
>+#endif
>+
> #if 0
> static unsigned char XCMiscCode;
> #endif
>@@ -143,7 +149,10 @@
> 
>     REQUEST_SIZE_MATCH(xXCMiscGetXIDListReq);
> 
>-    pids = (XID *)ALLOCATE_LOCAL(stuff->count * sizeof(XID));
>+    if (stuff->count > UINT32_MAX / sizeof(XID))
>+	    return BadAlloc;
>+
>+    pids = (XID *)Xalloc(stuff->count * sizeof(XID));
>     if (!pids)
>     {
> 	return BadAlloc;
>@@ -164,7 +173,7 @@
>     	client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
> 	WriteSwappedDataToClient(client, count * sizeof(XID), pids);
>     }
>-    DEALLOCATE_LOCAL(pids);
>+    Xfree(pids);
>     return(client->noClientException);
> }
>

Actions: View | Diff

Attachments on bug 232996: 150431