From 46fbb3d31bf73df4bd0259a146e9929f62a9c488 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 1 Jun 2012 23:22:31 +0100
Subject: [PATCH] uxa: NameForAtom may return NULL

Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 src/intel_display.c | 2 ++
 1 file changed, 2 insertions(+)

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++) {