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

Source/WebCore/fileapi/WebKitBlobBuilder.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 70 matching lines @@
 }
 
 void WebKitBlobBuilder::append(const String& text, ExceptionCode& ec)
 {
     append(text, String(), ec);
 }
 
 #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());
     m_size += buffer.size() - oldSize;
 }
 #endif
 
 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.
         File* file = static_cast<File*>(blob);
         long long snapshotSize;
         double snapshotModificationTime;
         file->captureSnapshot(snapshotSize, snapshotModificationTime);
 
         m_size += snapshotSize;
         m_items.append(BlobDataItem(file->path(), 0, snapshotSize, snapshotModificationTime));
@@ skipping 13 matching lines @@
     RefPtr<Blob> blob = Blob::create(blobData.release(), m_size);
 
     // After creating a blob from the current blob data, we do not need to keep the data around any more. Instead, we only
     // need to keep a reference to the URL of the blob just created.
     m_items.append(BlobDataItem(blob->url(), 0, m_size));
 
     return blob;
 }
 
 } // namespace WebCore