aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew Knight <andrew.knight@digia.com>2014-04-08 20:09:02 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-08 20:51:42 +0200
commita8e7829f561a08cb66fbc07ba5af9769a356ea92 (patch)
tree0e6b7504126700706ffbf7fee09f2fa07d75d2c0 /src
parent680813c682c5677d037f93a260dd57007335908c (diff)
Zero memory in WinRT allocator
The memory is assumed to be zero-initialized, and this wasn't happening on WinRT. Task-number: QTBUG-38132 Change-Id: I8686a40dacdc20bd702cc43a067209bfa997e7b2 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp b/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp
index f851087eb2..7ed9f539e5 100644
--- a/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp
+++ b/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp
@@ -38,6 +38,7 @@ void* OSAllocator::reserveUncommitted(size_t bytes, Usage, bool, bool, bool)
void* result = _aligned_malloc(bytes, 16);
if (!result)
CRASH();
+ memset(result, 0, bytes);
return result;
}