diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-14 13:50:32 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-30 10:38:38 +0200 |
| commit | 9ba195479ac3bc2c64d43ecf26f8c97e65483a5c (patch) | |
| tree | a2adb51c84ea151af9ba6f70eddb53d52669f9c3 | |
| parent | 40dfda760ffd0cb89372dd0a5995e77f9b8a5ed1 (diff) | |
Fix copy and paste error
Fix first error "Null pointer dereferencing" identified by static analysis from
http://www.viva64.com/en/b/0251/
Change-Id: I984d6ac2c22fddfe5ccb507f5d95d3329bed0563
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2d.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index 29e83e8247..3481651b1e 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -3177,11 +3177,6 @@ QV4::ReturnedValue QQuickJSContext2DPixelData::getIndexed(QV4::Managed *m, uint QV4::ExecutionEngine *v4 = m->engine(); QV4::Scope scope(v4); QV4::Scoped<QQuickJSContext2DPixelData> r(scope, m->as<QQuickJSContext2DPixelData>()); - if (!m) { - if (hasProperty) - *hasProperty = false; - return m->engine()->currentContext()->throwTypeError(); - } if (r && index < static_cast<quint32>(r->image.width() * r->image.height() * 4)) { if (hasProperty) |