[gentoo-commits] gentoo-x86 commit in x11-misc/xscreensaver/files: xscreensaver-5.08-phosphor-segv.patch

[Samuli Suominen (ssuominen)]

ssuominen    09/04/30 14:12:44

  Added:                xscreensaver-5.08-phosphor-segv.patch
  Log:
  Fix segv with phosphor screensaver wrt #256446, thanks to Nick Soveiko.
  (Portage version: 2.1.6.11/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  x11-misc/xscreensaver/files/xscreensaver-5.08-phosphor-segv.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/xscreensaver-5.08-phosphor-segv.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/xscreensaver/files/xscreensaver-5.08-phosphor-segv.patch?rev=1.1&content-type=text/plain

Index: xscreensaver-5.08-phosphor-segv.patch
===================================================================
--- xscreensaver-5.08/hacks/phosphor.c.debug	2008-07-31 19:01:00.000000000 +0900
+++ xscreensaver-5.08/hacks/phosphor.c	2009-01-22 22:52:11.000000000 +0900
@@ -1353,6 +1353,7 @@
 	  if (state->pid)
 	    {
 	      waitpid(state->pid, NULL, 0);
+	      state->pid = 0;
 	      fclose (state->pipe);
 	    }
 	  else
@@ -1436,7 +1437,7 @@
   resize_grid (state);
 
 # if defined(HAVE_FORKPTY) && defined(TIOCSWINSZ)
-  if (state->pid)
+  if (state->pid && state->pipe)
     {
       /* Tell the sub-process that the screen size has changed. */
       struct winsize ws;