Merge 88510 - Calling WebKitBlobBuilder.append with null argument should not crash

Source/WebCore/fileapi/WebKitBlobBuilder.cpp

Index: Source/WebCore/fileapi/WebKitBlobBuilder.cpp
===================================================================
--- Source/WebCore/fileapi/WebKitBlobBuilder.cpp	(revision 88654)
+++ Source/WebCore/fileapi/WebKitBlobBuilder.cpp	(working copy)
@@ -88,6 +88,8 @@
 #if ENABLE(BLOB)
 void WebKitBlobBuilder::append(ArrayBuffer* arrayBuffer)
 {
+    if (!arrayBuffer)
+        return;
     Vector<char>& buffer = getBuffer();
     size_t oldSize = buffer.size();
     buffer.append(static_cast<const char*>(arrayBuffer->data()), arrayBuffer->byteLength());
@@ -97,6 +99,8 @@
 
 void WebKitBlobBuilder::append(Blob* blob)
 {
+    if (!blob)
+        return;
     if (blob->isFile()) {
         // If the blob is file that is not snapshoted, capture the snapshot now.
         // FIXME: This involves synchronous file operation. We need to figure out how to make it asynchronous.
Property changes on: Source\WebCore\fileapi\WebKitBlobBuilder.cpp
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/WebCore/fileapi/WebKitBlobBuilder.cpp:r53455