[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andreas.kling at nokia.com
andreas.kling at nokia.com
Wed Dec 22 15:47:57 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 16f8d4308ad620f4607e44c44f993920c8b96ac3
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 12 17:23:38 2010 +0000
2010-11-12 Andreas Kling <kling at webkit.org>
Reviewed by Antonio Gomes.
[Qt][WK2] Fix leaking of mapped files
MappedMemory::fileName was never set on the receiving side, which led
the MappedMemoryPool to call QFile::map() again when reusing an existing file.
* Platform/qt/MappedMemoryPool.cpp:
(WebKit::MappedMemoryPool::mapFile):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71919 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 00a1aed..91621a4 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-12 Andreas Kling <kling at webkit.org>
+
+ Reviewed by Antonio Gomes.
+
+ [Qt][WK2] Fix leaking of mapped files
+
+ MappedMemory::fileName was never set on the receiving side, which led
+ the MappedMemoryPool to call QFile::map() again when reusing an existing file.
+
+ * Platform/qt/MappedMemoryPool.cpp:
+ (WebKit::MappedMemoryPool::mapFile):
+
2010-11-12 Adam Roben <aroben at apple.com>
Windows build fix
diff --git a/WebKit2/Platform/qt/MappedMemoryPool.cpp b/WebKit2/Platform/qt/MappedMemoryPool.cpp
index 1b0f70d..622f93a 100644
--- a/WebKit2/Platform/qt/MappedMemoryPool.cpp
+++ b/WebKit2/Platform/qt/MappedMemoryPool.cpp
@@ -86,6 +86,7 @@ MappedMemory* MappedMemoryPool::mapFile(QString fileName, size_t size)
MappedMemory newMap;
newMap.file = new QFile(fileName);
+ newMap.fileName = fileName;
newMap.dataSize = size;
ASSERT(newMap.file->exists());
ASSERT(newMap.file->size() >= newMap.mapSize());
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list