summaryrefslogtreecommitdiff
path: root/Source/WebCore/plugins/PluginDatabase.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-08-12 09:27:39 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-08-12 09:27:39 +0200
commit3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch)
tree73dc228333948738bbe02976cacca8cd382bc978 /Source/WebCore/plugins/PluginDatabase.cpp
parentb32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff)
downloadqtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebCore/plugins/PluginDatabase.cpp')
-rw-r--r--Source/WebCore/plugins/PluginDatabase.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebCore/plugins/PluginDatabase.cpp b/Source/WebCore/plugins/PluginDatabase.cpp
index 9508c5b8c..e021bad0e 100644
--- a/Source/WebCore/plugins/PluginDatabase.cpp
+++ b/Source/WebCore/plugins/PluginDatabase.cpp
@@ -510,7 +510,8 @@ static bool readTime(time_t& resultTime, char*& start, const char* end)
if (start + sizeof(time_t) >= end)
return false;
- resultTime = *reinterpret_cast_ptr<time_t*>(start);
+ // The stream is not necessary aligned.
+ memcpy(&resultTime, start, sizeof(time_t));
start += sizeof(time_t);
return true;