Title: [133705] branches/safari-536.28-branch/Source/WebKit2
- Revision
- 133705
- Author
- [email protected]
- Date
- 2012-11-06 18:06:22 -0800 (Tue, 06 Nov 2012)
Log Message
Merged r128792. <rdar://problem/12516344>
Modified Paths
Diff
Modified: branches/safari-536.28-branch/Source/WebKit2/ChangeLog (133704 => 133705)
--- branches/safari-536.28-branch/Source/WebKit2/ChangeLog 2012-11-07 02:04:20 UTC (rev 133704)
+++ branches/safari-536.28-branch/Source/WebKit2/ChangeLog 2012-11-07 02:06:22 UTC (rev 133705)
@@ -1,5 +1,22 @@
2012-11-06 Lucas Forschler <[email protected]>
+ Merge r128792
+
+ 2012-09-17 Anders Carlsson <[email protected]>
+
+ Crash if we fail to allocate memory for the argument encoder buffer.
+ https://bugs.webkit.org/show_bug.cgi?id=88367
+
+ Reviewed by Andreas Kling.
+ <rdar://problem/11488239>
+
+ Since there's no way to recover from malloc returning null here, just crash.
+
+ * Platform/CoreIPC/ArgumentEncoder.cpp:
+ (CoreIPC::ArgumentEncoder::grow):
+
+2012-11-06 Lucas Forschler <[email protected]>
+
Merge r128774
2012-09-17 Anders Carlsson <[email protected]>
@@ -47425,3 +47442,4 @@
.
.
.
+.
Modified: branches/safari-536.28-branch/Source/WebKit2/Platform/CoreIPC/ArgumentEncoder.cpp (133704 => 133705)
--- branches/safari-536.28-branch/Source/WebKit2/Platform/CoreIPC/ArgumentEncoder.cpp 2012-11-07 02:04:20 UTC (rev 133704)
+++ branches/safari-536.28-branch/Source/WebKit2/Platform/CoreIPC/ArgumentEncoder.cpp 2012-11-07 02:06:22 UTC (rev 133705)
@@ -80,9 +80,10 @@
m_buffer = static_cast<uint8_t*>(malloc(newCapacity));
else
m_buffer = static_cast<uint8_t*>(realloc(m_buffer, newCapacity));
-
- // FIXME: What should we do if allocating memory fails?
+ if (!m_buffer)
+ CRASH();
+
m_bufferCapacity = newCapacity;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
