Attachment 16513 Details for Bug 15222 – even better dbe fixing - against master

[patch] even better dbe fixing - against master

dbe_fix.patch (text/plain), 3.59 KB, created by Dave Airlie on 2008-05-13 17:23:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Airlie

Created: 2008-05-13 17:23:44 UTC

Size: 3.59 KB

patch

obsolete

>diff --git a/dbe/dbe.c b/dbe/dbe.c
>index f864280..a950a8a 100644
>--- a/dbe/dbe.c
>+++ b/dbe/dbe.c
>@@ -229,7 +229,7 @@ ProcDbeAllocateBackBufferName(ClientPtr client)
>     xDbeSwapAction		swapAction;
>     VisualID			visual;
>     int				status;
>-
>+    int				add_index;
> 
>     REQUEST_SIZE_MATCH(xDbeAllocateBackBufferNameReq);
> 
>@@ -299,14 +299,6 @@ ProcDbeAllocateBackBufferName(ClientPtr client)
>             return(BadAlloc);
> 	bzero(pDbeWindowPriv, sizeof(DbeWindowPrivRec));
> 
>-        /* Make the window priv a DBE window priv resource. */
>-        if (!AddResource(stuff->buffer, dbeWindowPrivResType,
>-            (pointer)pDbeWindowPriv))
>-        {
>-            xfree(pDbeWindowPriv);
>-            return(BadAlloc);
>-        }
>-
>         /* Fill out window priv information. */
>         pDbeWindowPriv->pWindow      = pWin;
>         pDbeWindowPriv->width        = pWin->drawable.width;
>@@ -320,15 +312,15 @@ ProcDbeAllocateBackBufferName(ClientPtr client)
> 
>         /* Initialize the buffer ID list. */ 
>         pDbeWindowPriv->maxAvailableIDs = DBE_INIT_MAX_IDS;
>-        pDbeWindowPriv->IDs[0] = stuff->buffer;
>-        for (i = 1; i < DBE_INIT_MAX_IDS; i++)
>+
>+        add_index = 0;
>+        for (i = 0; i < DBE_INIT_MAX_IDS; i++)
>         {
>             pDbeWindowPriv->IDs[i] = DBE_FREE_ID_ELEMENT;
>         }
> 
>-
>         /* Actually connect the window priv to the window. */
>-	dixSetPrivate(&pWin->devPrivates, dbeWindowPrivKey, pDbeWindowPriv);
>+        dixSetPrivate(&pWin->devPrivates, dbeWindowPrivKey, pDbeWindowPriv);
> 
>     } /* if -- There is no buffer associated with the window. */
> 
>@@ -391,16 +383,7 @@ ProcDbeAllocateBackBufferName(ClientPtr client)
>             pDbeWindowPriv->maxAvailableIDs += DBE_INCR_MAX_IDS;
>         }
> 
>-        /* Finally, record the buffer ID in the array. */
>-        pDbeWindowPriv->IDs[i] = stuff->buffer;
>-
>-        /* Associate the new ID with an existing window priv. */
>-        if (!AddResource(stuff->buffer, dbeWindowPrivResType,
>-                         (pointer)pDbeWindowPriv))
>-        {
>-            pDbeWindowPriv->IDs[i] = DBE_FREE_ID_ELEMENT;
>-            return(BadAlloc);
>-        }
>+        add_index = i;
> 
>     } /* else -- A buffer is already associated with the window. */
> 
>@@ -409,14 +392,27 @@ ProcDbeAllocateBackBufferName(ClientPtr client)
>     status = (*pDbeScreenPriv->AllocBackBufferName)(pWin, stuff->buffer,
>                                                     stuff->swapAction);
> 
>-    if ((status != Success) && (pDbeWindowPriv->nBufferIDs == 0))
>+    if (status == Success)
>     {
>+        pDbeWindowPriv->IDs[add_index] = stuff->buffer;
>+        if (!AddResource(stuff->buffer, dbeWindowPrivResType,
>+                         (pointer)pDbeWindowPriv))
>+        {
>+            pDbeWindowPriv->IDs[add_index] = DBE_FREE_ID_ELEMENT;
>+
>+            if (pDbeWindowPriv->nBufferIDs == 0) {
>+                status = BadAlloc;
>+                goto out_free;
>+            }
>+        }
>+    } else {
>         /* The DDX buffer allocation routine failed for the first buffer of
>          * this window.
>          */
>-        dixSetPrivate(&pWin->devPrivates, dbeWindowPrivKey, NULL);
>-        xfree(pDbeWindowPriv);
>-        return(status);
>+
>+        if (pDbeWindowPriv->nBufferIDs == 0) {
>+            goto out_free;
>+        }
>     }
> 
>     /* Increment the number of buffers (XIDs) associated with this window. */
>@@ -428,6 +424,11 @@ ProcDbeAllocateBackBufferName(ClientPtr client)
> 
>     return(status);
> 
>+out_free:
>+    dixSetPrivate(&pWin->devPrivates, dbeWindowPrivKey, NULL);
>+    xfree(pDbeWindowPriv);
>+    return(status);    
>+
> } /* ProcDbeAllocateBackBufferName() */
> 
>

Actions: View | Splinter Review

Attachments on bug 15222: 15497 | 15498 | 15499 | 15500 | 15614 | 16341 | 16473 | 16477 | 16478 | 16513 | 16793

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.