diff options
Diffstat (limited to 'x11/xorg-libs/patches/patch-cv')
-rw-r--r-- | x11/xorg-libs/patches/patch-cv | 131 |
1 files changed, 0 insertions, 131 deletions
diff --git a/x11/xorg-libs/patches/patch-cv b/x11/xorg-libs/patches/patch-cv deleted file mode 100644 index a633f3e3325..00000000000 --- a/x11/xorg-libs/patches/patch-cv +++ /dev/null @@ -1,131 +0,0 @@ -$NetBSD: patch-cv,v 1.1 2007/01/17 16:32:35 joerg Exp $ - ---- programs/Xserver/dbe/dbe.c.orig 2005-07-03 07:01:17.000000000 +0000 -+++ programs/Xserver/dbe/dbe.c -@@ -55,6 +55,10 @@ - #include "xf86_ansic.h" - #endif - -+#if !defined(UINT32_MAX) -+#define UINT32_MAX 0xffffffffU -+#endif -+ - /* GLOBALS */ - - /* Per-screen initialization functions [init'ed by DbeRegisterFunction()] */ -@@ -733,11 +737,14 @@ ProcDbeSwapBuffers(client) - return(Success); - } - -+ if (nStuff > UINT32_MAX / sizeof(DbeSwapInfoRec)) -+ return BadAlloc; -+ - /* Get to the swap info appended to the end of the request. */ - dbeSwapInfo = (xDbeSwapInfo *)&stuff[1]; - - /* Allocate array to record swap information. */ -- swapInfo = (DbeSwapInfoPtr)ALLOCATE_LOCAL(nStuff * sizeof(DbeSwapInfoRec)); -+ swapInfo = (DbeSwapInfoPtr)Xalloc(nStuff * sizeof(DbeSwapInfoRec)); - if (swapInfo == NULL) - { - return(BadAlloc); -@@ -752,14 +759,14 @@ ProcDbeSwapBuffers(client) - if (!(pWin = SecurityLookupWindow(dbeSwapInfo[i].window, client, - SecurityWriteAccess))) - { -- DEALLOCATE_LOCAL(swapInfo); -+ Xfree(swapInfo); - return(BadWindow); - } - - /* Each window must be double-buffered - BadMatch. */ - if (DBE_WINDOW_PRIV(pWin) == NULL) - { -- DEALLOCATE_LOCAL(swapInfo); -+ Xfree(swapInfo); - return(BadMatch); - } - -@@ -768,7 +775,7 @@ ProcDbeSwapBuffers(client) - { - if (dbeSwapInfo[i].window == dbeSwapInfo[j].window) - { -- DEALLOCATE_LOCAL(swapInfo); -+ Xfree(swapInfo); - return(BadMatch); - } - } -@@ -779,7 +786,7 @@ ProcDbeSwapBuffers(client) - (dbeSwapInfo[i].swapAction != XdbeUntouched ) && - (dbeSwapInfo[i].swapAction != XdbeCopied )) - { -- DEALLOCATE_LOCAL(swapInfo); -+ Xfree(swapInfo); - return(BadValue); - } - -@@ -809,12 +816,12 @@ ProcDbeSwapBuffers(client) - error = (*pDbeScreenPriv->SwapBuffers)(client, &nStuff, swapInfo); - if (error != Success) - { -- DEALLOCATE_LOCAL(swapInfo); -+ Xfree(swapInfo); - return(error); - } - } - -- DEALLOCATE_LOCAL(swapInfo); -+ Xfree(swapInfo); - return(Success); - - } /* ProcDbeSwapBuffers() */ -@@ -898,10 +905,12 @@ ProcDbeGetVisualInfo(client) - - REQUEST_AT_LEAST_SIZE(xDbeGetVisualInfoReq); - -+ if (stuff->n > UINT32_MAX / sizeof(DrawablePtr)) -+ return BadAlloc; - /* Make sure any specified drawables are valid. */ - if (stuff->n != 0) - { -- if (!(pDrawables = (DrawablePtr *)ALLOCATE_LOCAL(stuff->n * -+ if (!(pDrawables = (DrawablePtr *)Xalloc(stuff->n * - sizeof(DrawablePtr)))) - { - return(BadAlloc); -@@ -914,7 +923,7 @@ ProcDbeGetVisualInfo(client) - if (!(pDrawables[i] = (DrawablePtr)SecurityLookupDrawable( - drawables[i], client, SecurityReadAccess))) - { -- DEALLOCATE_LOCAL(pDrawables); -+ Xfree(pDrawables); - return(BadDrawable); - } - } -@@ -926,7 +935,7 @@ ProcDbeGetVisualInfo(client) - { - if (pDrawables) - { -- DEALLOCATE_LOCAL(pDrawables); -+ Xfree(pDrawables); - } - - return(BadAlloc); -@@ -953,7 +962,7 @@ ProcDbeGetVisualInfo(client) - /* Free pDrawables if we needed to allocate it above. */ - if (pDrawables) - { -- DEALLOCATE_LOCAL(pDrawables); -+ Xfree(pDrawables); - } - - return(BadAlloc); -@@ -1034,7 +1043,7 @@ ProcDbeGetVisualInfo(client) - - if (pDrawables) - { -- DEALLOCATE_LOCAL(pDrawables); -+ Xfree(pDrawables); - } - - return(client->noClientException); |