diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-09 03:31:34 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-09 03:31:34 (GMT) |
commit | 3d7252234b86cbf791dd1bb747befcaab688877f (patch) | |
tree | 33e3c132a96b68c7e7fe946c2cafd4dad9ebe15d /src/corelib/tools | |
parent | 8ff8d45451c1cf7d31750f945fe58067121e92f4 (diff) | |
parent | 96960787f7cb6f3937cdf7e3da77988259979008 (diff) | |
download | Qt-3d7252234b86cbf791dd1bb747befcaab688877f.zip Qt-3d7252234b86cbf791dd1bb747befcaab688877f.tar.gz Qt-3d7252234b86cbf791dd1bb747befcaab688877f.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Fix resource leak in symbian socket engine
Use memmove in QListData::append(int) as regions overlap.
Diffstat (limited to 'src/corelib/tools')
-rw-r--r-- | src/corelib/tools/qlist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp index 36a9c60..e68ddd5 100644 --- a/src/corelib/tools/qlist.cpp +++ b/src/corelib/tools/qlist.cpp @@ -237,7 +237,7 @@ void **QListData::append(int n) if (b - n >= 2 * d->alloc / 3) { // we have enough space. Just not at the end -> move it. e -= b; - ::memcpy(d->array, d->array + b, e * sizeof(void *)); + ::memmove(d->array, d->array + b, e * sizeof(void *)); d->begin = 0; } else { realloc(grow(d->alloc + n)); |