Changeset 209208 in webkit

Timestamp:

Dec 1, 2016 2:23:50 PM (7 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r208629. rdar://problem/29277337

Location:

branches/safari-602-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/SerializedScriptValue.cpp (modified) (1 diff)

branches/safari-602-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2016-12-01  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r208629. rdar://problem/29277337
+
+    2016-11-11  Brent Fulgham  <bfulgham@apple.com>
+
+            Unreviewed build fix after r208628
+
+            * bindings/js/SerializedScriptValue.cpp:
+            (WebCore::CloneDeserializer::readTerminal): Cast pointer arithmetic to
+            uint32_t to avoid warning.
+
 2016-12-01  Matthew Hanson  <matthew_hanson@apple.com>
 

branches/safari-602-branch/Source/WebCore/bindings/js/SerializedScriptValue.cpp

@@ -2270 +2270 @@
             if (!read(length))
                 return JSValue();
-            if (m_end - m_ptr < length) {
+            if (static_cast<uint32_t>(m_end - m_ptr) < length) {
                 fail();
                 return JSValue();