1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a crash when calling QOpenGLTexture::setData with a null QImage.

Browse Source 
Change-Id: Idf8ae00cff6929114b38dcb003c259c83a11dbaa
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
This commit is contained in:
Juha Turunen 2015-12-08 00:51:54 -08:00 committed by Juha Turunen
parent 6e14d63db0
commit 672f7dfdcd
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/opengl/qopengltexture.cpp
View File

@ -3050,6 +3050,12 @@ void QOpenGLTexture::setData(const QImage& image, MipMapGeneration genMipMaps)
qWarning("QOpenGLTexture::setData() requires a valid current context"); qWarning("QOpenGLTexture::setData() requires a valid current context");
return; return;
} }
if (image.isNull()) {
qWarning("QOpenGLTexture::setData() tried to set a null image");
return;
}
if (context->isOpenGLES() && context->format().majorVersion() < 3) if (context->isOpenGLES() && context->format().majorVersion() < 3)
setFormat(QOpenGLTexture::RGBAFormat); setFormat(QOpenGLTexture::RGBAFormat);
else else

15
tests/auto/gui/qopengl/tst_qopengl.cpp
View File

@ -39,6 +39,7 @@
#include <QtGui/QOpenGLVertexArrayObject> #include <QtGui/QOpenGLVertexArrayObject>
#include <QtGui/QOpenGLBuffer> #include <QtGui/QOpenGLBuffer>
#include <QtGui/QOpenGLPaintDevice> #include <QtGui/QOpenGLPaintDevice>
#include <QtGui/QOpenGLTexture>
#include <QtGui/QPainter> #include <QtGui/QPainter>
#include <QtGui/QScreen> #include <QtGui/QScreen>
#include <QtGui/QWindow> #include <QtGui/QWindow>
@ -97,8 +98,8 @@ private slots:
void textureblitterFullTargetRectTransform(); void textureblitterFullTargetRectTransform();
void textureblitterPartTargetRectTransform(); void textureblitterPartTargetRectTransform();
void defaultSurfaceFormat(); void defaultSurfaceFormat();
void imageFormatPainting(); void imageFormatPainting();
void nullTextureInitializtion();
#ifdef USE_GLX #ifdef USE_GLX
void glxContextWrap(); void glxContextWrap();
@ -1367,6 +1368,18 @@ void tst_QOpenGL::bufferMapRange()
ctx->doneCurrent(); ctx->doneCurrent();
} }
void tst_QOpenGL::nullTextureInitializtion()
{
QScopedPointer<QSurface> surface(createSurface(QSurface::Window));
QOpenGLContext ctx;
ctx.create();
ctx.makeCurrent(surface.data());
QImage i;
QOpenGLTexture t(i);
QVERIFY(!t.isCreated());
}
QTEST_MAIN(tst_QOpenGL) QTEST_MAIN(tst_QOpenGL)
#include "tst_qopengl.moc" #include "tst_qopengl.moc"