yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plugins/screencast: Prefer glReadnPixels() and glGetnTexImage()

Browse source 
They should prevent potentially writing texture data outside the bounds
of the memfd buffer.
This commit is contained in:
Vlad Zahorodnii 2024-07-04 14:01:38 +03:00
parent b452a5a5fb
commit 74d7c33a97
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/plugins/screencast/screencastutils.h
View file

@ -57,13 +57,15 @@ static void doGrabTexture(GLTexture *texture, QImage *target)
if (context->isOpenGLES() || context->glPlatform()->driver() == Driver_NVidia) { if (context->isOpenGLES() || context->glPlatform()->driver() == Driver_NVidia) {
GLFramebuffer fbo(texture); GLFramebuffer fbo(texture);
GLFramebuffer::pushFramebuffer(&fbo); GLFramebuffer::pushFramebuffer(&fbo);
glReadPixels(0, 0, size.width(), size.height(), closestGLType(target->format()), GL_UNSIGNED_BYTE, target->bits()); context->glReadnPixels(0, 0, size.width(), size.height(), closestGLType(target->format()), GL_UNSIGNED_BYTE, target->sizeInBytes(), target->bits());
GLFramebuffer::popFramebuffer(); GLFramebuffer::popFramebuffer();
} else if (context->openglVersion() >= Version(4, 5)) { } else {
glGetTextureImage(texture->texture(), 0, closestGLType(target->format()), GL_UNSIGNED_BYTE, target->sizeInBytes(), target->bits()); if (context->openglVersion() >= Version(4, 5)) {
glGetnTexImage(texture->target(), 0, closestGLType(target->format()), GL_UNSIGNED_BYTE, target->sizeInBytes(), target->bits());
} else { } else {
glGetTexImage(texture->target(), 0, closestGLType(target->format()), GL_UNSIGNED_BYTE, target->bits()); glGetTexImage(texture->target(), 0, closestGLType(target->format()), GL_UNSIGNED_BYTE, target->bits());
} }
}
if (invertNeededAndSupported) { if (invertNeededAndSupported) {
if (!prev) { if (!prev) {