frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dri2: Fix detection of wrong prime_id in GetScreenPrime. 

Checking the iterating variable ("slave") against null can not detect if the
xorg_list_for_each_entry finished without break being invoked - slave variable
will be always non-null. This caused segfault whenever someone tried to use
DRI_PRIME with incorrect id while having at least one render offloading slave
configured.

Restructurize the GetScreenPrime to work as expected.

Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Michal Srb 2014-04-15 18:54:35 +03:00 committed by Keith Packard
parent c08d2b8ccb
commit 3dba171f5e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/dri2/dri2.c
View File

@ -156,11 +156,9 @@ GetScreenPrime(ScreenPtr master, int prime_id)
ds = DRI2GetScreen(slave); ds = DRI2GetScreen(slave);
if (ds->prime_id == prime_id) if (ds->prime_id == prime_id)
break;
}
if (!slave)
return master;
return slave; return slave;
}
return master;
} }
static DRI2ScreenPtr static DRI2ScreenPtr