Title: [179031] branches/safari-600.1.4.15-branch/Source/WebCore
- Revision
- 179031
- Author
- lforsch...@apple.com
- Date
- 2015-01-23 15:06:46 -0800 (Fri, 23 Jan 2015)
Log Message
Merged r174373. rdar://problem/19434944
Modified Paths
Diff
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (179030 => 179031)
--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-23 23:05:05 UTC (rev 179030)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-23 23:06:46 UTC (rev 179031)
@@ -1,5 +1,19 @@
2015-01-23 Lucas Forschler <lforsch...@apple.com>
+ Merge r174373
+
+ 2014-10-06 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Addressing post-review comment on r174297.
+ https://bugs.webkit.org/show_bug.cgi?id=137355
+
+ Unreviewed.
+
+ * rendering/RenderText.cpp:
+ (WebCore::RenderText::stringView):
+
+2015-01-23 Lucas Forschler <lforsch...@apple.com>
+
Merge r174297
2014-10-03 Myles C. Maxfield <mmaxfi...@apple.com>
Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp (179030 => 179031)
--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp 2015-01-23 23:05:05 UTC (rev 179030)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderText.cpp 2015-01-23 23:06:46 UTC (rev 179031)
@@ -1527,6 +1527,11 @@
StringView RenderText::stringView(int start, int stop) const
{
+ ASSERT(static_cast<unsigned>(start) <= length());
+ ASSERT(static_cast<unsigned>(stop) <= length());
+ ASSERT(start <= stop);
+ ASSERT(start >= 0);
+ ASSERT(stop >= 0);
if (is8Bit())
return StringView(characters8() + start, stop - start);
return StringView(characters16() + start, stop - start);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
