Skip to content

fix(linux): guard XRandR NULL returns to avoid a SEGV during display setup #5644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sresarehumantoo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(linux): guard XRandR NULL returns to avoid a SEGV during display setup #5644

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/platform/linux/x11grab.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,10 @@ namespace platf {
}

screen_res_t screenr {x11::rr::GetScreenResources(xdisplay.get(), xwindow)};
if (!screenr) {
BOOST_LOG(error) << "Could not query X screen resources"sv;
return -1;
}
int output = screenr->noutput;

output_info_t result;
Expand All @@ -531,8 +535,12 @@ namespace platf {
}
}

crtc_info_t crt_info;
if (result_found && result->crtc) {
crtc_info_t crt_info {x11::rr::GetCrtcInfo(xdisplay.get(), screenr.get(), result->crtc)};
crt_info = crtc_info_t {x11::rr::GetCrtcInfo(xdisplay.get(), screenr.get(), result->crtc)};
}

if (crt_info) {
BOOST_LOG(info)
<< "Streaming display: "sv << result->name << " with res "sv << crt_info->width << 'x' << crt_info->height << " offset by "sv << crt_info->x << 'x' << crt_info->y;

Expand Down Expand Up @@ -942,6 +950,10 @@ namespace platf {

auto xwindow = DefaultRootWindow(xdisplay.get());
screen_res_t screenr {x11::rr::GetScreenResources(xdisplay.get(), xwindow)};
if (!screenr) {
BOOST_LOG(error) << "Could not query X screen resources"sv;
return {};
}
int output = screenr->noutput;

std::vector<std::string> names;
Expand Down