Attachment 926 Details for Bug 1402 – proposed patch

[patch] proposed patch

bigfont.diff (text/plain), 1.18 KB, created by Alexander Gottwald on 2004-09-17 05:05:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Gottwald

Created: 2004-09-17 05:05:38 UTC

Size: 1.18 KB

patch

obsolete

>Index: programs/Xserver/Xext/xf86bigfont.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xext/xf86bigfont.c,v
>retrieving revision 1.1.4.1.2.1
>diff -u -r1.1.4.1.2.1 xf86bigfont.c
>--- programs/Xserver/Xext/xf86bigfont.c	17 Mar 2004 20:29:58 -0000	1.1.4.1.2.1
>+++ programs/Xserver/Xext/xf86bigfont.c	17 Sep 2004 11:56:08 -0000
>@@ -471,13 +471,16 @@
> 
>     if (nCharInfos > 0) {
> #ifdef HAS_SHM
>-	pDesc = (ShmDescPtr) FontGetPrivate(pFont, FontShmdescIndex);
>+	if (!badSysCall)
>+	    pDesc = (ShmDescPtr) FontGetPrivate(pFont, FontShmdescIndex);
>+	else
>+	    pDesc = NULL;
> 	if (pDesc) {
> 	    pCI = (xCharInfo *) pDesc->attach_addr;
> 	    if (stuff_flags & XF86Bigfont_FLAGS_Shm)
> 		shmid = pDesc->shmid;
> 	} else {
>-	    if (stuff_flags & XF86Bigfont_FLAGS_Shm)
>+	    if (stuff_flags & XF86Bigfont_FLAGS_Shm && !badSysCall)
> 		pDesc = shmalloc(nCharInfos * sizeof(xCharInfo)
> 				 + sizeof(CARD32));
> 	    if (pDesc) {
>@@ -522,7 +525,7 @@
> 		}
> 	    }
> #ifdef HAS_SHM
>-	    if (pDesc) {
>+	    if (pDesc && !badSysCall) {
> 		*(CARD32 *)(pCI + nCharInfos) = signature;
> 		if (!FontSetPrivate(pFont, FontShmdescIndex, pDesc)) {
> 		    shmdealloc(pDesc);

Actions: View | Splinter Review

Attachments on bug 1402: 926 | 947 | 948

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.