diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-08 17:43:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-08 17:43:48 (GMT) |
| commit | ec44803109910127657b214f4556651a9619430d (patch) | |
| tree | 3895b96cfa8d95965f061e828f0f6a354e9874d9 | |
| parent | e5b6414f5b28a93c917380fb57f56d0ca46f2961 (diff) | |
| parent | d7294806fc43e8611c4441881e511af5f18c60db (diff) | |
| download | Qt-ec44803109910127657b214f4556651a9619430d.zip Qt-ec44803109910127657b214f4556651a9619430d.tar.gz Qt-ec44803109910127657b214f4556651a9619430d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Prevent out-of-bounds memory access in drawhelper.
| -rw-r--r-- | src/gui/painting/qdrawhelper.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index a4ab278..024a69d 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -6432,6 +6432,8 @@ Q_STATIC_TEMPLATE_FUNCTION void blendTransformedTiled(int count, const QSpan *sp int px = int(tx) - (tx < 0); int py = int(ty) - (ty < 0); + px %= image_width; + py %= image_height; if (px < 0) px += image_width; if (py < 0) |