Coverity #928: Don't dereference screen if it's null.XORG-7_0_99_901

2 files changed, 8 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 6b5ad14..3f2caa6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-06  Adam Jackson  <ajax@freedesktop.org>
+
+	* src/dmx.c:
+	Coverity #928: Don't dereference screen if it's null.
+
 2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
 
 	* configure.ac:
diff --git a/src/dmx.c b/src/dmx.c
index 1df28e6..5df1068 100644
--- a/src/dmx.c
+++ b/src/dmx.c
@@ -407,6 +407,9 @@ Bool DMXAddScreen(Display *dpy, const char *displayName, unsigned int mask,
     int                length;
     int                paddedLength;
 
+    if (!screen)
+	return False;
+
     DMXCheckExtension(dpy, info, False);
 
     LockDisplay(dpy);