summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-06-01 23:22:31 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-06-02 08:38:21 +0100
commit46fbb3d31bf73df4bd0259a146e9929f62a9c488 (patch)
tree982c0f68972c2e80fc45aaa896e4a9c6a792f50b
parent8451d5dd3c992bcfad9f71aa890b6b225884b978 (diff)
uxa: NameForAtom may return NULL
Reported-by: Zdenek Kabelac <zkabelac@redhat.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/intel_display.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/intel_display.c b/src/intel_display.c
index 89f7259b..609cbf7c 100644
--- a/src/intel_display.c
+++ b/src/intel_display.c
@@ -1176,6 +1176,8 @@ intel_output_set_property(xf86OutputPtr output, Atom property,
return FALSE;
memcpy(&atom, value->data, 4);
name = NameForAtom(atom);
+ if (name == NULL)
+ return FALSE;
/* search for matching name string, then set its value down */
for (j = 0; j < p->mode_prop->count_enums; j++) {