Patch for use of RT_NONE busted by an update to resource.c

Pete Zaitcev zaitcev at redhat.com
Wed Aug 6 13:25:15 PDT 2008


Hi All:

What would it take to include the attached patch for dixfonts.c?

The full story is here:
https://bugzilla.redhat.com/show_bug.cgi?id=430416#c25

But in short, someone changed the resource lookup to use masking instead
of comparisons for 1.4, and this broke zero resource type as a side effect.
I think the easiest fix is to stop using the zero type.

Thanks,
-- Pete

diff -urp -X dontdiff xorg-server-20080415/dix/dixfonts.c xorg-server-20080415-p3/dix/dixfonts.c
--- xorg-server-20080415/dix/dixfonts.c	2008-05-01 18:04:08.000000000 -0700
+++ xorg-server-20080415-p3/dix/dixfonts.c	2008-05-02 02:52:11.000000000 -0700
@@ -2036,7 +2036,7 @@ FreeFonts(void)
 FontPtr
 find_old_font(XID id)
 {
-    return (FontPtr) SecurityLookupIDByType(NullClient, id, RT_NONE,
+    return (FontPtr) SecurityLookupIDByType(NullClient, id, RT_FONT,
 					    DixUnknownAccess);
 }
 
@@ -2049,13 +2049,13 @@ GetNewFontClientID()
 int
 StoreFontClientFont(FontPtr pfont, Font id)
 {
-    return AddResource(id, RT_NONE, (pointer) pfont);
+    return AddResource(id, RT_FONT, (pointer) pfont);
 }
 
 void
 DeleteFontClientID(Font id)
 {
-    FreeResource(id, RT_NONE);
+    FreeResource(id, RT_FONT);
 }
 
 int



More information about the xorg mailing list