blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #108 from martinetd/realloc_crtcs_index 

drm realloc_crtcs: check we found an output
This commit is contained in:
Drew DeVault 2017-08-18 13:37:44 -04:00 committed by GitHub
parent d748fd1a8e 0252c8e072
commit 617be97fa0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/drm/drm.c
View File

@ -405,7 +405,7 @@ static void realloc_crtcs(struct wlr_drm_backend *backend,
memset(possible_crtc, 0, sizeof(possible_crtc)); memset(possible_crtc, 0, sizeof(possible_crtc));
size_t index = 0; ssize_t index = -1;
for (size_t i = 0; i < backend->outputs->length; ++i) { for (size_t i = 0; i < backend->outputs->length; ++i) {
struct wlr_drm_output *o = backend->outputs->items[i]; struct wlr_drm_output *o = backend->outputs->items[i];
if (o == output) { if (o == output) {
@ -419,6 +419,7 @@ static void realloc_crtcs(struct wlr_drm_backend *backend,
possible_crtc[i] = o->possible_crtc; possible_crtc[i] = o->possible_crtc;
crtc[o->crtc - backend->crtcs] = i; crtc[o->crtc - backend->crtcs] = i;
} }
assert(index != -1);
possible_crtc[index] = output->possible_crtc; possible_crtc[index] = output->possible_crtc;
match_obj(backend->outputs->length, possible_crtc, match_obj(backend->outputs->length, possible_crtc,