diff options
| author | Ben Murdoch <benm@google.com> | 2011-07-13 10:14:36 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-07-13 11:03:14 +0100 |
| commit | d0147a863b872ecaa451ab0dce2a348760e99e2c (patch) | |
| tree | b4819830b7ab03f384ed8ab83734ac0f46193263 /Source/WebCore/fileapi | |
| parent | 65b45b34343dc5d5b9dbeda52e9de428e146c8f7 (diff) | |
| download | external_webkit-d0147a863b872ecaa451ab0dce2a348760e99e2c.zip external_webkit-d0147a863b872ecaa451ab0dce2a348760e99e2c.tar.gz external_webkit-d0147a863b872ecaa451ab0dce2a348760e99e2c.tar.bz2 | |
Merge WebKit at branches/chromium/742 r89068: Initial merge by Git.
Take us to top of Chrome 12 release branch (12.0.742.130)
Change-Id: I4408a97e343a118cf4a1bb9d71367bcc2c16ae48
Diffstat (limited to 'Source/WebCore/fileapi')
| -rw-r--r-- | Source/WebCore/fileapi/WebKitBlobBuilder.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebCore/fileapi/WebKitBlobBuilder.cpp b/Source/WebCore/fileapi/WebKitBlobBuilder.cpp index 2f40db7..0671e05 100644 --- a/Source/WebCore/fileapi/WebKitBlobBuilder.cpp +++ b/Source/WebCore/fileapi/WebKitBlobBuilder.cpp @@ -88,6 +88,8 @@ void WebKitBlobBuilder::append(const String& text, ExceptionCode& 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()); @@ -97,6 +99,8 @@ void WebKitBlobBuilder::append(ArrayBuffer* arrayBuffer) 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. |