summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2011-11-24 13:10:15 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2011-11-30 18:59:43 -0800
commit8229cf75b34c2991eaf973f05326be9bfa16ef0c (patch)
tree0b0c1abce480f83cdf08677d0d4f0048d334fe4d
parent2b8d373bddf427bcd95e2595cb64740ebd1d0d30 (diff)
XcursorImageLoadCursor: return failure if _XcursorGetDisplayInfo fails
Error: Null pointer dereference (CWE 476) Read from null pointer 'info' at line 615 of src/cursor.c in function 'XcursorImageLoadCursor'. Function '_XcursorGetDisplayInfo' may return constant 'NULL' at line 134, called at line 597. Null pointer introduced at line 134 of src/display.c in function '_XcursorGetDisplayInfo'. [ This bug was found by the Parfait 0.3.7 bug checking tool. For more information see http://labs.oracle.com/projects/parfait/ ] Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--src/cursor.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cursor.c b/src/cursor.c
index b36339b..92bd417 100644
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -601,6 +601,9 @@ XcursorImageLoadCursor (Display *dpy, const XcursorImage *image)
GC gc;
XGCValues gcv;
+ if (!info)
+ return 0;
+
core.src_image = XCreateImage (dpy, NULL, 1, ZPixmap,
0, NULL, image->width, image->height,
32, 0);