--- xscreensaver-5.01/driver/lock.c.cve-2007-1859	2007-05-02 12:12:32.000000000 -0600
+++ xscreensaver-5.01/driver/lock.c	2007-05-02 12:12:32.000000000 -0600
@@ -1531,7 +1531,7 @@
       */
       struct passwd *pw = getpwuid (getuid ());
       char *d = DisplayString (si->dpy);
-      char *u = (pw->pw_name ? pw->pw_name : "???");
+      char *u = (pw && pw->pw_name ? pw->pw_name : "???");
       int opt = 0;
       int fac = 0;