mirror/Sunshine
1
0
Fork 1
mirror of https://github.com/LizardByte/Sunshine.git synced 2026-08-07 10:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(linux/kmsgrab): fix handle leak in update_cursor (#4757)

Browse Source
This commit is contained in:
Conn O'Griofa
2026-02-22 20:56:35 +00:00
committed by GitHub
parent 95da4b5c85
commit 502be64682
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/platform/linux/kmsgrab.cpp
+16 -4
View File
@@ -60,7 +60,8 @@ namespace platf {
class wrapper_fb {
public:
wrapper_fb(drmModeFB *fb):
wrapper_fb(uint32_t card_fd, drmModeFB *fb):
card_fd {card_fd},
fb {fb},
fb_id {fb->fb_id},
width {fb->width},
@@ -74,7 +75,8 @@ namespace platf {
pitches[0] = fb->pitch;
}
wrapper_fb(drmModeFB2 *fb2):
wrapper_fb(uint32_t card_fd, drmModeFB2 *fb2):
card_fd {card_fd},
fb2 {fb2},
fb_id {fb2->fb_id},
width {fb2->width},
@@ -88,6 +90,15 @@ namespace platf {
}
~wrapper_fb() {
std::ranges::for_each(handles, [&](auto &handle) {
if (handle) {
struct drm_gem_close close_args = {};
close_args.handle = handle;
drmIoctl(card_fd, DRM_IOCTL_GEM_CLOSE, &close_args);
}
});
if (fb) {
drmModeFreeFB(fb);
} else if (fb2) {
@@ -95,6 +106,7 @@ namespace platf {
}
}
uint32_t card_fd;
drmModeFB *fb = nullptr;
drmModeFB2 *fb2 = nullptr;
uint32_t fb_id;
@@ -359,12 +371,12 @@ namespace platf {
auto fb2 = drmModeGetFB2(fd.el, plane->fb_id);
if (fb2) {
return std::make_unique<wrapper_fb>(fb2);
return std::make_unique<wrapper_fb>(fd.el, fb2);
}
auto fb = drmModeGetFB(fd.el, plane->fb_id);
if (fb) {
return std::make_unique<wrapper_fb>(fb);
return std::make_unique<wrapper_fb>(fd.el, fb);
}
return nullptr;