Merge branch 'master' into XACE-SELINUX

Conflicts: os/access.c
2007-10-17 15:00:54 -04:00
parent af4dde0ac1 feac075952
commit c3f7b86255
99 changed files with 10634 additions and 1906 deletions
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -151,6 +151,8 @@ _X_EXPORT Bool AddExtensionAlias(char *alias, ExtensionEntry *ext)
    char *name;
    char **aliases;

+    if (!ext)
+        return FALSE ;
    aliases = (char **)xrealloc(ext->aliases,
 				(ext->num_aliases + 1) * sizeof(char *));
    if (!aliases)