diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-08-25 10:49:57 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-08-25 11:00:32 +0100 |
| commit | 097c2567939f2063749acf0bc768df7bb002d535 (patch) | |
| tree | ce5f4f974ea25bf158fc7e8bec824bd2de03e203 /src/sna/sna_video_sprite.c | |
| parent | d7e6e9b83ce029e81767de35124b84914ad7d54b (diff) | |
sna: Add a few more checks for a hosted Xserver before walking CRTC lists
If we are hosted, we do not own the CRTC configuration, and deferencing
the private data structures believing them to be ours, only leads to
disaster.
Based on patches by Christopher James Halse Rogers.
Reported-by: Christopher James Halse Rogers <raof@ubuntu.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_video_sprite.c')
| -rw-r--r-- | src/sna/sna_video_sprite.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/sna/sna_video_sprite.c b/src/sna/sna_video_sprite.c index 8b094c4f..22b5e08f 100644 --- a/src/sna/sna_video_sprite.c +++ b/src/sna/sna_video_sprite.c @@ -366,8 +366,7 @@ static int sna_video_sprite_put_image(ClientPtr client, sna_video_frame_init(video, format->id, width, height, &frame); - if (!sna_video_clip_helper(sna->scrn, video, &frame, - &crtc, &dst_box, + if (!sna_video_clip_helper(video, &frame, &crtc, &dst_box, src_x, src_y, draw->x + drw_x, draw->y + drw_y, src_w, src_h, drw_w, drw_h, &clip)) |