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

dmx: Fix null pointer dereference 

A null pointer dereference can occur in dmxSync, because TimerForce
does not handle a null pointer.

dmxSyncTimer is set to NULL a few lines above on a certain condition,
which happened on my machine. The explicit NULL check allowed me to
start Xdmx again without a segmentation fault.

Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Tobias Stoeckmann 2017-03-12 14:21:38 +01:00 committed by Adam Jackson
parent 5cdfcdef81
commit 21eda7464d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/dmx/dmxsync.c
View File

@ -182,7 +182,7 @@ dmxSync(DMXScreenInfo * dmxScreen, Bool now)
/* Do sync or set time for later */ /* Do sync or set time for later */
if (now || !dmxScreen) { if (now || !dmxScreen) {
if (!TimerForce(dmxSyncTimer)) if (dmxSyncTimer == NULL || !TimerForce(dmxSyncTimer))
dmxSyncCallback(NULL, 0, NULL); dmxSyncCallback(NULL, 0, NULL);
/* At this point, dmxSyncPending == 0 because /* At this point, dmxSyncPending == 0 because
* dmxSyncCallback must have been called. */ * dmxSyncCallback must have been called. */