Attachment 27443 Details for Bug 22648 – This fixes the crash.

[patch] This fixes the crash.

xace.patch (text/plain), 4.79 KB, created by Michael Lorenz on 2009-07-06 23:11:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Lorenz

Created: 2009-07-06 23:11:20 UTC

Size: 4.79 KB

patch

obsolete

>Index: xace.c
>===================================================================
>RCS file: /cvsroot/xsrc/external/mit/xorg-server/dist/Xext/xace.c,v
>retrieving revision 1.1.1.2
>retrieving revision 1.2
>diff -u -w -r1.1.1.2 -r1.2
>--- xace.c	11 Jun 2009 01:52:56 -0000	1.1.1.2
>+++ xace.c	7 Jul 2009 05:32:44 -0000	1.2
>@@ -95,114 +95,104 @@
>     switch (hook)
>     {
> 	case XACE_RESOURCE_ACCESS: {
>-	    XaceResourceAccessRec rec = {
>-		va_arg(ap, ClientPtr),
>-		va_arg(ap, XID),
>-		va_arg(ap, RESTYPE),
>-		va_arg(ap, pointer),
>-		va_arg(ap, RESTYPE),
>-		va_arg(ap, pointer),
>-		va_arg(ap, Mask),
>-		Success /* default allow */
>-	    };
>+	    XaceResourceAccessRec rec;
>+	    rec.client = va_arg(ap, ClientPtr);
>+	    rec.id = va_arg(ap, XID);
>+	    rec.rtype = va_arg(ap, RESTYPE);
>+	    rec.res = va_arg(ap, pointer);
>+	    rec.ptype = va_arg(ap, RESTYPE);
>+	    rec.parent = va_arg(ap, pointer);
>+	    rec.access_mode = va_arg(ap, Mask);
>+	    rec.status = Success; /* default allow */
> 	    calldata = &rec;
> 	    prv = &rec.status;
> 	    break;
> 	}
> 	case XACE_DEVICE_ACCESS: {
>-	    XaceDeviceAccessRec rec = {
>-		va_arg(ap, ClientPtr),
>-		va_arg(ap, DeviceIntPtr),
>-		va_arg(ap, Mask),
>-		Success /* default allow */
>-	    };
>+	    XaceDeviceAccessRec rec;
>+	    rec.client = va_arg(ap, ClientPtr);
>+	    rec.dev = va_arg(ap, DeviceIntPtr);
>+	    rec.access_mode = va_arg(ap, Mask);
>+	    rec.status = Success; /* default allow */
> 	    calldata = &rec;
> 	    prv = &rec.status;
> 	    break;
> 	}
> 	case XACE_SEND_ACCESS: {
>-	    XaceSendAccessRec rec = {
>-		va_arg(ap, ClientPtr),
>-		va_arg(ap, DeviceIntPtr),
>-		va_arg(ap, WindowPtr),
>-		va_arg(ap, xEventPtr),
>-		va_arg(ap, int),
>-		Success /* default allow */
>-	    };
>+	    XaceSendAccessRec rec;
>+	    rec.client = va_arg(ap, ClientPtr);
>+	    rec.dev = va_arg(ap, DeviceIntPtr);
>+	    rec.pWin = va_arg(ap, WindowPtr);
>+	    rec.events = va_arg(ap, xEventPtr);
>+	    rec.count = va_arg(ap, int);
>+	    rec.status = Success; /* default allow */
> 	    calldata = &rec;
> 	    prv = &rec.status;
> 	    break;
> 	}
> 	case XACE_RECEIVE_ACCESS: {
>-	    XaceReceiveAccessRec rec = {
>-		va_arg(ap, ClientPtr),
>-		va_arg(ap, WindowPtr),
>-		va_arg(ap, xEventPtr),
>-		va_arg(ap, int),
>-		Success /* default allow */
>-	    };
>+	    XaceReceiveAccessRec rec;
>+	    rec.client = va_arg(ap, ClientPtr);
>+	    rec.pWin = va_arg(ap, WindowPtr);
>+	    rec.events = va_arg(ap, xEventPtr);
>+	    rec.count = va_arg(ap, int);
>+	    rec.status = Success; /* default allow */
> 	    calldata = &rec;
> 	    prv = &rec.status;
> 	    break;
> 	}
> 	case XACE_CLIENT_ACCESS: {
>-	    XaceClientAccessRec rec = {
>-		va_arg(ap, ClientPtr),
>-		va_arg(ap, ClientPtr),
>-		va_arg(ap, Mask),
>-		Success /* default allow */
>-	    };
>+	    XaceClientAccessRec rec;
>+	    rec.client = va_arg(ap, ClientPtr);
>+	    rec.target = va_arg(ap, ClientPtr);
>+	    rec.access_mode = va_arg(ap, Mask);
>+	    rec.status = Success; /* default allow */
> 	    calldata = &rec;
> 	    prv = &rec.status;
> 	    break;
> 	}
> 	case XACE_EXT_ACCESS: {
>-	    XaceExtAccessRec rec = {
>-		va_arg(ap, ClientPtr),
>-		va_arg(ap, ExtensionEntry*),
>-		DixGetAttrAccess,
>-		Success /* default allow */
>-	    };
>+	    XaceExtAccessRec rec;
>+	    rec.client = va_arg(ap, ClientPtr);
>+	    rec.ext = va_arg(ap, ExtensionEntry*);
>+	    rec.access_mode = DixGetAttrAccess;
>+	    rec.status = Success; /* default allow */
> 	    calldata = &rec;
> 	    prv = &rec.status;
> 	    break;
> 	}
> 	case XACE_SERVER_ACCESS: {
>-	    XaceServerAccessRec rec = {
>-		va_arg(ap, ClientPtr),
>-		va_arg(ap, Mask),
>-		Success /* default allow */
>-	    };
>+	    XaceServerAccessRec rec;
>+	    rec.client = va_arg(ap, ClientPtr);
>+	    rec.access_mode = va_arg(ap, Mask);
>+	    rec.status = Success; /* default allow */
> 	    calldata = &rec;
> 	    prv = &rec.status;
> 	    break;
> 	}
> 	case XACE_SCREEN_ACCESS:
> 	case XACE_SCREENSAVER_ACCESS: {
>-	    XaceScreenAccessRec rec = {
>-		va_arg(ap, ClientPtr),
>-		va_arg(ap, ScreenPtr),
>-		va_arg(ap, Mask),
>-		Success /* default allow */
>-	    };
>+	    XaceScreenAccessRec rec;
>+	    rec.client = va_arg(ap, ClientPtr);
>+	    rec.screen = va_arg(ap, ScreenPtr);
>+	    rec.access_mode = va_arg(ap, Mask);
>+	    rec.status = Success; /* default allow */
> 	    calldata = &rec;
> 	    prv = &rec.status;
> 	    break;
> 	}
> 	case XACE_AUTH_AVAIL: {
>-	    XaceAuthAvailRec rec = {
>-		va_arg(ap, ClientPtr),
>-		va_arg(ap, XID)
>-	    };
>+	    XaceAuthAvailRec rec;
>+	    rec.client = va_arg(ap, ClientPtr);
>+	    rec.authId = va_arg(ap, XID);
> 	    calldata = &rec;
> 	    break;
> 	}
> 	case XACE_KEY_AVAIL: {
>-	    XaceKeyAvailRec rec = {
>-		va_arg(ap, xEventPtr),
>-		va_arg(ap, DeviceIntPtr),
>-		va_arg(ap, int)
>-	    };
>+	    XaceKeyAvailRec rec;
>+	    rec.event = va_arg(ap, xEventPtr);
>+	    rec.keybd = va_arg(ap, DeviceIntPtr);
>+	    rec.count = va_arg(ap, int);
> 	    calldata = &rec;
> 	    break;
> 	}

Actions: View | Splinter Review

Attachments on bug 22648: 27443

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.