Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel: Querying device attributes must be non-NULL 

Check first for a NULL platform device before querying the attributes or
else suffer a segfault during PCI probing.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-10-03 14:08:36 +01:00
parent b7d5292e01
commit 58b26055f4
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/intel_device.c
View File

@ -223,8 +223,16 @@ static char *find_render_node(int fd)
#if defined(ODEV_ATTRIB_PATH)
static char *get_path(struct xf86_platform_device *dev)
{
const char *path = xf86_get_platform_device_attrib(dev, ODEV_ATTRIB_PATH);
return path ? strdup(path) : NULL;
const char *path;
if (dev == NULL)
return NULL;
path = xf86_get_platform_device_attrib(dev, ODEV_ATTRIB_PATH);
if (path == NULL)
return NULL;
return strdup(path);
}
#else
@ -239,9 +247,15 @@ static char *get_path(struct xf86_platform_device *dev)
#if defined(ODEV_ATTRIB_FD) && 0
static int get_fd(struct xf86_platform_device *dev)
{
const char *str = xf86_get_platform_device_attrib(dev, ODEV_ATTRIB_FD);
const char *str;
if (dev == NULL)
return -1;
str = xf86_get_platform_device_attrib(dev, ODEV_ATTRIB_FD);
if (str == NULL)
return -1;
return atoi(str);
}