Attachment 1013 Details for Bug 1501 – [FIXED_X11R68x] Improved fix

[patch] [FIXED_X11R68x] Improved fix

diff.1501-2 (text/plain), 2.04 KB, created by Egbert Eich on 2004-10-05 00:42:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Egbert Eich

Created: 2004-10-05 00:42:18 UTC

Size: 2.04 KB

patch

obsolete

>Index: extras/Mesa/src/mesa/drivers/dri/common/dri_util.c
>===================================================================
>RCS file: /cvs/xorg/xc/extras/Mesa/src/mesa/drivers/dri/common/dri_util.c,v
>retrieving revision 1.1.1.3
>diff -u -r1.1.1.3 dri_util.c
>--- extras/Mesa/src/mesa/drivers/dri/common/dri_util.c	12 Aug 2004 23:05:42 -0000	1.1.1.3
>+++ extras/Mesa/src/mesa/drivers/dri/common/dri_util.c	5 Oct 2004 07:37:08 -0000
>@@ -1347,7 +1347,7 @@
>     int directCapable;
>     __DRIscreenPrivate *psp = NULL;
>     drm_handle_t hSAREA;
>-    drmAddress pSAREA;
>+    drmAddress pSAREA = MAP_FAILED;
>     char *BusID;
>     __GLcontextModes *modes;
>     __GLcontextModes *temp;
>@@ -1360,8 +1360,9 @@
>     int   status;
>     const char * err_msg;
>     const char * err_extra;
>-
>-
>+    memset (&framebuffer, 0, sizeof (framebuffer));
>+    framebuffer.base = MAP_FAILED;
>+    
>     if (!XF86DRIQueryDirectRenderingCapable(dpy, scrn, &directCapable)
> 	|| !directCapable) {
> 	return NULL;
>Index: lib/GL/glx/glxext.c
>===================================================================
>RCS file: /cvs/xorg/xc/lib/GL/glx/glxext.c,v
>retrieving revision 1.5
>diff -u -r1.5 glxext.c
>--- lib/GL/glx/glxext.c	27 Jul 2004 20:23:58 -0000	1.5
>+++ lib/GL/glx/glxext.c	5 Oct 2004 07:37:08 -0000
>@@ -730,7 +730,7 @@
>     __DRIscreenPrivate *psp = NULL;
> #ifndef GLX_USE_APPLEGL
>     drm_handle_t hSAREA;
>-    drmAddress pSAREA;
>+    drmAddress pSAREA = MAP_FAILED;
>     char *BusID;
>     __DRIversion   ddx_version;
>     __DRIversion   dri_version;
>@@ -742,7 +742,6 @@
>     const char * err_extra;
>     int api_ver = __glXGetInternalVersion();
> 
>-
>     dri_version.major = driDpy->private->driMajor;
>     dri_version.minor = driDpy->private->driMinor;
>     dri_version.patch = driDpy->private->driPatch;
>@@ -751,6 +750,9 @@
>     err_msg = "XF86DRIOpenConnection";
>     err_extra = NULL;
> 
>+    memset (&framebuffer, 0, sizeof (framebuffer));
>+    framebuffer.base = MAP_FAILED;
>+    
>     if (XF86DRIOpenConnection(dpy, scrn, &hSAREA, &BusID)) {
> 	fd = drmOpen(NULL,BusID);
> 	Xfree(BusID); /* No longer needed */

Flags:

roland.mainz: 6.8-branch+

Actions: View | Splinter Review

Attachments on bug 1501: 985 | 1013

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.