xserver: Branch 'master' - 2 commits

[Matthieu Herrb]

 hw/xfree86/common/xf86Configure.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 387563b77743d92be83420d982eaf57f5459a883
Merge: 85f650c... f6e01fa...
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Sun Nov 23 13:15:46 2008 +0100

    Merge branch 'master' of git+ssh://herrb@git.freedesktop.org/git/xorg/xserver

commit 85f650c9b76ab2e244f01908a7941c320635becd
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date:   Sun Nov 23 13:14:27 2008 +0100

    missing action in if statement.

diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 85cd5b6..6680a61 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -780,6 +780,7 @@ DoConfigure()
     	if (!(filename =
 	     (char *)xalloc(strlen(home) + 
 	  			 strlen(configfile) + 3)))
+		goto bail;
 
       	if (home[0] == '/' && home[1] == '\0')
             home[0] = '\0';