public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
* [PATCH] Avoid calling xf86nameCompare() with a NULL pointer.
@ 2012-06-12 18:15 Cyril Brulebois
  2012-06-12 20:18 ` Chris Wilson
  0 siblings, 1 reply; 3+ messages in thread
From: Cyril Brulebois @ 2012-06-12 18:15 UTC (permalink / raw)
  To: intel-gfx; +Cc: Cyril Brulebois

Device sections without a Driver property would lead to a server
segfault because of a NULL pointer's being passed as the second
argument of xf86nameCompare().

Debian bug #677206 <http://bugs.debian.org/677206>

Signed-off-by: Cyril Brulebois <kibi@debian.org>
---
 src/intel_module.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/intel_module.c b/src/intel_module.c
index 4430ac6..fa78b59 100644
--- a/src/intel_module.c
+++ b/src/intel_module.c
@@ -299,7 +299,7 @@ static XF86ConfDevicePtr
 _xf86findDriver(const char *ident, XF86ConfDevicePtr p)
 {
 	while (p) {
-		if (xf86nameCompare(ident, p->dev_driver) == 0)
+		if (p->dev_driver && xf86nameCompare(ident, p->dev_driver) == 0)
 			return p;
 
 		p = p->list.next;
-- 
1.7.10

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] Avoid calling xf86nameCompare() with a NULL pointer.
  2012-06-12 18:15 [PATCH] Avoid calling xf86nameCompare() with a NULL pointer Cyril Brulebois
@ 2012-06-12 20:18 ` Chris Wilson
  2012-06-12 20:30   ` Cyril Brulebois
  0 siblings, 1 reply; 3+ messages in thread
From: Chris Wilson @ 2012-06-12 20:18 UTC (permalink / raw)
  To: intel-gfx; +Cc: Cyril Brulebois

On Tue, 12 Jun 2012 20:15:19 +0200, Cyril Brulebois <kibi@debian.org> wrote:
> Device sections without a Driver property would lead to a server
> segfault because of a NULL pointer's being passed as the second
> argument of xf86nameCompare().
> 
> Debian bug #677206 <http://bugs.debian.org/677206>
> 
> Signed-off-by: Cyril Brulebois <kibi@debian.org>

Pushed with only a slightly different colour of paint. Thanks,
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] Avoid calling xf86nameCompare() with a NULL pointer.
  2012-06-12 20:18 ` Chris Wilson
@ 2012-06-12 20:30   ` Cyril Brulebois
  0 siblings, 0 replies; 3+ messages in thread
From: Cyril Brulebois @ 2012-06-12 20:30 UTC (permalink / raw)
  To: Chris Wilson; +Cc: intel-gfx


[-- Attachment #1.1: Type: text/plain, Size: 155 bytes --]

Chris Wilson <chris@chris-wilson.co.uk> (12/06/2012):
> Pushed with only a slightly different colour of paint. Thanks,
> -Chris

Cake? Yummy!

Mraw,
KiBi.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-06-12 20:30 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-12 18:15 [PATCH] Avoid calling xf86nameCompare() with a NULL pointer Cyril Brulebois
2012-06-12 20:18 ` Chris Wilson
2012-06-12 20:30   ` Cyril Brulebois

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox