Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / public / platform / WebVector.h

diff --git a/src/third_party/WebKit/public/platform/WebVector.h b/src/third_party/WebKit/public/platform/WebVector.h
index a12ca6d..e83a2d0 100644 (file)
--- a/src/third_party/WebKit/public/platform/WebVector.h
+++ b/src/third_party/WebKit/public/platform/WebVector.h
@@ -34,6 +34,8 @@
 #include "WebCommon.h"
 
 #include <algorithm>
+#include <limits>
+#include <stdlib.h>
 
 namespace blink {
 
@@ -153,6 +155,7 @@ public:
 private:
     void initialize(size_t size)
     {
+        validateSize(size);
         m_size = size;
         if (!m_size)
             m_ptr = 0;
@@ -166,6 +169,7 @@ private:
     template <typename U>
     void initializeFrom(const U* values, size_t size)
     {
+        validateSize(size);
         m_size = size;
         if (!m_size)
             m_ptr = 0;
@@ -176,6 +180,12 @@ private:
         }
     }
 
+    void validateSize(size_t size)
+    {
+        if (std::numeric_limits<size_t>::max() / sizeof(T) < size)
+            abort();
+    }
+
     void destroy()
     {
         for (size_t i = 0; i < m_size; ++i)