Title: [95034] branches/chromium/874/Source/WebCore/platform/graphics/Gradient.cpp
- Revision
- 95034
- Author
- ad...@chromium.org
- Date
- 2011-09-13 10:58:02 -0700 (Tue, 13 Sep 2011)
Log Message
Merge 95010 - Fix out-of-bounds access in Gradient::sortStopsIfNecessary
https://bugs.webkit.org/show_bug.cgi?id=67958
Reviewed by Darin Adler.
Reported by Valgrind in http://crbug.com/77049.
The errant code was added as an optimization in r67804.
This patch reverts that one, as all parties agree that the optimization
doesn't seem worthwhile, and there clearly aren't any tests covering
the special case.
No new tests, as existing tests should cover the remaining call to
|std::stable_sort|.
* platform/graphics/Gradient.cpp:
(WebCore::Gradient::sortStopsIfNecessary):
TBR=ad...@chromium.org
Review URL: http://codereview.chromium.org/7891013
Modified Paths
Diff
Modified: branches/chromium/874/Source/WebCore/platform/graphics/Gradient.cpp (95033 => 95034)
--- branches/chromium/874/Source/WebCore/platform/graphics/Gradient.cpp 2011-09-13 17:54:15 UTC (rev 95033)
+++ branches/chromium/874/Source/WebCore/platform/graphics/Gradient.cpp 2011-09-13 17:58:02 UTC (rev 95034)
@@ -124,10 +124,6 @@
if (!m_stops.size())
return;
- // Shortcut for the ideal case (ordered 2-stop gradient)
- if (m_stops.size() == 2 && compareStops(*m_stops.begin(), *m_stops.end()))
- return;
-
std::stable_sort(m_stops.begin(), m_stops.end(), compareStops);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
