Title: [279020] branches/safari-611-branch/Source/WebCore
- Revision
- 279020
- Author
- [email protected]
- Date
- 2021-06-17 15:59:22 -0700 (Thu, 17 Jun 2021)
Log Message
Cherry-pick r278975. rdar://problem/79474077
Make FontFaceSet::Iterator's bounds check more robust
https://bugs.webkit.org/show_bug.cgi?id=227048
<rdar://problem/78871890>
Reviewed by Simon Fraser.
We were checking for one specific bad value, when we should have been checking for all bad values.
* css/FontFaceSet.cpp:
(WebCore::FontFaceSet::Iterator::next):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278975 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-611-branch/Source/WebCore/ChangeLog (279019 => 279020)
--- branches/safari-611-branch/Source/WebCore/ChangeLog 2021-06-17 22:59:17 UTC (rev 279019)
+++ branches/safari-611-branch/Source/WebCore/ChangeLog 2021-06-17 22:59:22 UTC (rev 279020)
@@ -1,5 +1,36 @@
2021-06-17 Alan Coon <[email protected]>
+ Cherry-pick r278975. rdar://problem/79474077
+
+ Make FontFaceSet::Iterator's bounds check more robust
+ https://bugs.webkit.org/show_bug.cgi?id=227048
+ <rdar://problem/78871890>
+
+ Reviewed by Simon Fraser.
+
+ We were checking for one specific bad value, when we should have been checking for all bad values.
+
+ * css/FontFaceSet.cpp:
+ (WebCore::FontFaceSet::Iterator::next):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@278975 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-06-16 Myles C. Maxfield <[email protected]>
+
+ Make FontFaceSet::Iterator's bounds check more robust
+ https://bugs.webkit.org/show_bug.cgi?id=227048
+ <rdar://problem/78871890>
+
+ Reviewed by Simon Fraser.
+
+ We were checking for one specific bad value, when we should have been checking for all bad values.
+
+ * css/FontFaceSet.cpp:
+ (WebCore::FontFaceSet::Iterator::next):
+
+2021-06-17 Alan Coon <[email protected]>
+
Cherry-pick r278870. rdar://problem/79473993
[Mac] CoreMedia WrapperClass does not need alignment fixup
Modified: branches/safari-611-branch/Source/WebCore/css/FontFaceSet.cpp (279019 => 279020)
--- branches/safari-611-branch/Source/WebCore/css/FontFaceSet.cpp 2021-06-17 22:59:17 UTC (rev 279019)
+++ branches/safari-611-branch/Source/WebCore/css/FontFaceSet.cpp 2021-06-17 22:59:22 UTC (rev 279020)
@@ -91,7 +91,7 @@
RefPtr<FontFace> FontFaceSet::Iterator::next()
{
- if (m_index == m_target->size())
+ if (m_index >= m_target->size())
return nullptr;
return m_target->backing()[m_index++].wrapper();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
