summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-07 00:58:59 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-07 00:58:59 +0000
commitf9bc007d71f58db93b7eadeb8c77d0f90379c620 (patch)
tree548058714136182375b98090b1358423c3a867a2
parent1f862e619f12b54bee2efbb66f77c750184b191f (diff)
Coverity #159: Prevent a possible NULL chase.XORG-7_0_99_901
-rw-r--r--ChangeLog5
-rw-r--r--src/display.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5784089..339f87b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-06 Adam Jackson <ajax@freedesktop.org>
+
+ * src/display.c:
+ Coverity #159: Prevent a possible NULL chase.
+
2006-03-04 Daniel Stone <daniel@freedesktop.org>
* include/X11/Xcursor/Xcursor.h:
diff --git a/src/display.c b/src/display.c
index 252a056..a2e685c 100644
--- a/src/display.c
+++ b/src/display.c
@@ -57,7 +57,8 @@ _XcursorCloseDisplay (Display *dpy, XExtCodes *codes)
}
_XUnlockMutex (_Xglobal_lock);
- _XcursorFreeDisplayInfo (info);
+ if (info)
+ _XcursorFreeDisplayInfo (info);
return 0;
}