frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugzilla #1402: fix BigFont extension if SHM is compiled in but not 

working. Does not access SHM and privates if the SHM syscall failed
    during extension initialization.
This commit is contained in:
Alexander Gottwald 2004-09-19 12:59:52 +00:00
parent 90ff3688cd
commit 908287adda
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Xext/xf86bigfont.c
View File

@ -471,13 +471,16 @@ ProcXF86BigfontQueryFont(
if (nCharInfos > 0) { if (nCharInfos > 0) {
#ifdef HAS_SHM #ifdef HAS_SHM
if (!badSysCall)
pDesc = (ShmDescPtr) FontGetPrivate(pFont, FontShmdescIndex); pDesc = (ShmDescPtr) FontGetPrivate(pFont, FontShmdescIndex);
else
pDesc = NULL;
if (pDesc) { if (pDesc) {
pCI = (xCharInfo *) pDesc->attach_addr; pCI = (xCharInfo *) pDesc->attach_addr;
if (stuff_flags & XF86Bigfont_FLAGS_Shm) if (stuff_flags & XF86Bigfont_FLAGS_Shm)
shmid = pDesc->shmid; shmid = pDesc->shmid;
} else { } else {
if (stuff_flags & XF86Bigfont_FLAGS_Shm) if (stuff_flags & XF86Bigfont_FLAGS_Shm && !badSysCall)
pDesc = shmalloc(nCharInfos * sizeof(xCharInfo) pDesc = shmalloc(nCharInfos * sizeof(xCharInfo)
+ sizeof(CARD32)); + sizeof(CARD32));
if (pDesc) { if (pDesc) {
@ -522,7 +525,7 @@ ProcXF86BigfontQueryFont(
} }
} }
#ifdef HAS_SHM #ifdef HAS_SHM
if (pDesc) { if (pDesc && !badSysCall) {
*(CARD32 *)(pCI + nCharInfos) = signature; *(CARD32 *)(pCI + nCharInfos) = signature;
if (!FontSetPrivate(pFont, FontShmdescIndex, pDesc)) { if (!FontSetPrivate(pFont, FontShmdescIndex, pDesc)) {
shmdealloc(pDesc); shmdealloc(pDesc);