diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-10-22 12:36:18 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-10-26 10:26:02 +0000 |
| commit | f9fae251ca07401ee1b0039edc6ea6b7a522b5a7 (patch) | |
| tree | 2dff3c7006f5a00ab6791a0e932109807a217ab4 /src/quick/scenegraph/qsgrenderloop.cpp | |
| parent | 901b88c6ae6c476a8ad9825d9020325a9a58ab61 (diff) | |
Quick: Sanitize reading environment variables.
Where possible, use qEnvironmentVariableIsSet()/
qEnvironmentVariableIsEmpty() instead of checking on the
return value of qgetenv().
Where the value is required, add a check using one of
qEnvironmentVariableIsSet()/Empty().
Move QSGAtlasTexture::qsg_envInt() to qsgrenderer.cpp
for reuse as qt_sg_envInt() and add qt_sg_envFloat().
Change-Id: I4c93f16c228d4f537154f389a0fa1427654485f7
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Diffstat (limited to 'src/quick/scenegraph/qsgrenderloop.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgrenderloop.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp index 87dd521807..68947d3a3c 100644 --- a/src/quick/scenegraph/qsgrenderloop.cpp +++ b/src/quick/scenegraph/qsgrenderloop.cpp @@ -199,13 +199,15 @@ QSGRenderLoop *QSGRenderLoop::instance() else if (qmlForceThreadedRenderer()) loopType = ThreadedRenderLoop; - const QByteArray loopName = qgetenv("QSG_RENDER_LOOP"); - if (loopName == QByteArrayLiteral("windows")) - loopType = WindowsRenderLoop; - else if (loopName == QByteArrayLiteral("basic")) - loopType = BasicRenderLoop; - else if (loopName == QByteArrayLiteral("threaded")) - loopType = ThreadedRenderLoop; + if (Q_UNLIKELY(qEnvironmentVariableIsSet("QSG_RENDER_LOOP"))) { + const QByteArray loopName = qgetenv("QSG_RENDER_LOOP"); + if (loopName == QByteArrayLiteral("windows")) + loopType = WindowsRenderLoop; + else if (loopName == QByteArrayLiteral("basic")) + loopType = BasicRenderLoop; + else if (loopName == QByteArrayLiteral("threaded")) + loopType = ThreadedRenderLoop; + } switch (loopType) { case ThreadedRenderLoop: |