Bug#448157: CVE-2007-5585 authentication bypass (FTBFS with patch)

[Jamie Zawinski]

On Nov 5, 2007, at 4:11 PM, Steffen Joeris wrote:
With this patch, xscreensaver fails to build:

Sorry, typo: pw->prompt_screen should have been pw->prompt_screen- 
>screen.  Revised patch:


diff -u -r1.85 lock.c
--- lock.c      10 Jul 2007 20:27:24 -0000      1.85
+++ lock.c      1 Nov 2007 09:34:59 -0000
@@ -1076,9 +1076,10 @@
              pw->user_entry_pixmap = 0;
            }
 
-         pw->user_entry_pixmap = XCreatePixmap(si->dpy, si->passwd_dialog,
-             rects[0].width, rects[0].height, 
pw->prompt_screen->current_depth);
-
+         pw->user_entry_pixmap = 
+            XCreatePixmap (si->dpy, si->passwd_dialog,
+                           rects[0].width, rects[0].height, 
+                           DefaultDepthOfScreen (pw->prompt_screen->screen));
 
          XFillRectangle (si->dpy, pw->user_entry_pixmap, gc2,
                          0, 0, rects[0].width, rects[0].height);