Attachment 16478 Details for Bug 15222 – Another possible patch

[patch] Another possible patch

dbe-patch.diff (text/plain), 1.76 KB, created by Paul Anderson on 2008-05-11 23:40:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Anderson

Created: 2008-05-11 23:40:53 UTC

Size: 1.76 KB

patch

obsolete

>--- dbe.c.orig	2008-05-12 00:25:06.533959000 -0600
>+++ dbe.c	2008-05-12 00:26:53.162930000 -0600
>@@ -299,14 +299,6 @@
>             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;
>@@ -409,13 +401,28 @@
>     status = (*pDbeScreenPriv->AllocBackBufferName)(pWin, stuff->buffer,
>                                                     stuff->swapAction);
> 
>-    if ((status != Success) && (pDbeWindowPriv->nBufferIDs == 0))
>+    if (status == Success)
>     {
>-        /* The DDX buffer allocation routine failed for the first buffer of
>-         * this window.
>-         */
>-        xfree(pDbeWindowPriv);
>-        return(status);
>+        if (pDbeWindowPriv->nBufferIDs == 0)
>+        {
>+            /* Make the window priv a DBE window priv resource. */
>+            if (!AddResource(stuff->buffer, dbeWindowPrivResType,
>+                (pointer)pDbeWindowPriv))
>+            {
>+                xfree(pDbeWindowPriv);
>+                pWin->devPrivates[dbeWindowPrivIndex].ptr = (pointer)NULL;
>+                return(BadAlloc);
>+            }
>+        }
>+    }
>+    else
>+    {
>+        if (pDbeWindowPriv->nBufferIDs == 0)
>+        {
>+            xfree(pDbeWindowPriv);
>+            pWin->devPrivates[dbeWindowPrivIndex].ptr = (pointer)NULL;
>+            return(status);
>+        }
>     }
> 
>     /* Increment the number of buffers (XIDs) associated with this window. */

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.