Title: [209208] branches/safari-602-branch/Source/WebCore
- Revision
- 209208
- Author
- matthew_han...@apple.com
- Date
- 2016-12-01 14:23:50 -0800 (Thu, 01 Dec 2016)
Log Message
Merge r208629. rdar://problem/29277337
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (209207 => 209208)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-12-01 22:23:47 UTC (rev 209207)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-12-01 22:23:50 UTC (rev 209208)
@@ -1,5 +1,17 @@
2016-12-01 Matthew Hanson <matthew_han...@apple.com>
+ Merge r208629. rdar://problem/29277337
+
+ 2016-11-11 Brent Fulgham <bfulg...@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_han...@apple.com>
+
Merge r208628. rdar://problem/29277337
2016-11-11 Brent Fulgham <bfulg...@apple.com>
Modified: branches/safari-602-branch/Source/WebCore/bindings/js/SerializedScriptValue.cpp (209207 => 209208)
--- branches/safari-602-branch/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2016-12-01 22:23:47 UTC (rev 209207)
+++ branches/safari-602-branch/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2016-12-01 22:23:50 UTC (rev 209208)
@@ -2269,7 +2269,7 @@
uint32_t length;
if (!read(length))
return JSValue();
- if (m_end - m_ptr < length) {
+ if (static_cast<uint32_t>(m_end - m_ptr) < length) {
fail();
return JSValue();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
