Attachment 948 Details for Bug 1402 – [FIXED_X11R68x] revised patch

[patch] [FIXED_X11R68x] revised patch

bigfont.diff (text/plain), 1.41 KB, created by Alexander Gottwald on 2004-09-20 02:29:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Gottwald

Created: 2004-09-20 02:29:10 UTC

Size: 1.41 KB

patch

obsolete

>Index: xf86bigfont.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xext/xf86bigfont.c,v
>retrieving revision 1.2
>retrieving revision 1.4
>diff -u -r1.2 -r1.4
>--- xf86bigfont.c	23 Apr 2004 18:44:41 -0000	1.2
>+++ xf86bigfont.c	20 Sep 2004 08:44:54 -0000	1.4
>@@ -99,12 +99,12 @@
> 
> static unsigned int pagesize;
> 
>+static Bool badSysCall = FALSE;
>+
> #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__)
> 
> #include <sys/signal.h>
> 
>-static Bool badSysCall = FALSE;
>-
> static void
> SigSysHandler(
>      int signo)
>@@ -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);
>c);

Flags:

roland.mainz: 6.8-branch+

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.