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

output: refuse to enable with zero mode 

This can happen if the compositor enables an output without
picking a mode, or performs a modeset with a zero width/height.
This commit is contained in:
Simon Ser 2021-10-26 10:31:36 +02:00 committed by Simon Zeni
parent 3d6ca9942d
commit bf42630d32
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
types/output/output.c
View File

@ -547,6 +547,16 @@ static bool output_basic_test(struct wlr_output *output) {
enabled = output->pending.enabled; enabled = output->pending.enabled;
} }
if (enabled && (output->pending.committed & (WLR_OUTPUT_STATE_ENABLED |
WLR_OUTPUT_STATE_MODE))) {
int pending_width, pending_height;
output_pending_resolution(output, &pending_width, &pending_height);
if (pending_width == 0 || pending_height == 0) {
wlr_log(WLR_DEBUG, "Tried to enable an output with a zero mode");
return false;
}
}
if (!enabled && output->pending.committed & WLR_OUTPUT_STATE_BUFFER) { if (!enabled && output->pending.committed & WLR_OUTPUT_STATE_BUFFER) {
wlr_log(WLR_DEBUG, "Tried to commit a buffer on a disabled output"); wlr_log(WLR_DEBUG, "Tried to commit a buffer on a disabled output");
return false; return false;