diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/fileapi/Blob.cpp | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/fileapi/Blob.cpp')
| -rw-r--r-- | WebCore/fileapi/Blob.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/fileapi/Blob.cpp b/WebCore/fileapi/Blob.cpp index d5a5602..90df3c4 100644 --- a/WebCore/fileapi/Blob.cpp +++ b/WebCore/fileapi/Blob.cpp @@ -86,7 +86,7 @@ PassRefPtr<Blob> Blob::slice(long long start, long long length, const String& co if (start >= size) { start = 0; length = 0; - } else if (start + length > size) + } else if (start + length > size || length > std::numeric_limits<long long>::max() - start) length = size - start; OwnPtr<BlobData> blobData = BlobData::create(); |