Title: [101340] trunk/Source/WebCore
- Revision
- 101340
- Author
- [email protected]
- Date
- 2011-11-29 01:23:28 -0800 (Tue, 29 Nov 2011)
Log Message
Unreviewed, rolling out r101302.
http://trac.webkit.org/changeset/101302
https://bugs.webkit.org/show_bug.cgi?id=73293
massive crashes on gtk/win bots - m_bytes assertion fires
(Requested by WildFox on #webkit).
Patch by Sheriff Bot <[email protected]> on 2011-11-29
* platform/image-decoders/ImageDecoder.cpp:
(WebCore::ImageFrame::setSize):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (101339 => 101340)
--- trunk/Source/WebCore/ChangeLog 2011-11-29 09:15:49 UTC (rev 101339)
+++ trunk/Source/WebCore/ChangeLog 2011-11-29 09:23:28 UTC (rev 101340)
@@ -1,3 +1,15 @@
+2011-11-29 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r101302.
+ http://trac.webkit.org/changeset/101302
+ https://bugs.webkit.org/show_bug.cgi?id=73293
+
+ massive crashes on gtk/win bots - m_bytes assertion fires
+ (Requested by WildFox on #webkit).
+
+ * platform/image-decoders/ImageDecoder.cpp:
+ (WebCore::ImageFrame::setSize):
+
2011-11-29 Sean Wang <[email protected]>
Upstream BlackBerry porting of platform/image-decoders
Modified: trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp (101339 => 101340)
--- trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp 2011-11-29 09:15:49 UTC (rev 101339)
+++ trunk/Source/WebCore/platform/image-decoders/ImageDecoder.cpp 2011-11-29 09:23:28 UTC (rev 101340)
@@ -189,14 +189,14 @@
bool ImageFrame::setSize(int newWidth, int newHeight)
{
- ASSERT(!m_bytes);
- size_t backingStoreSize = newWidth * newHeight;
- if (!m_backingStore.tryReserveCapacity(backingStoreSize))
- return false;
+ // NOTE: This has no way to check for allocation failure if the requested
+ // size was too big...
+ m_backingStore.resize(newWidth * newHeight);
m_bytes = m_backingStore.data();
m_size = IntSize(newWidth, newHeight);
zeroFillPixelData();
+
return true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
