Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Side by Side Diff: third_party/WebKit/Source/core/fileapi/FileReaderLoader.cpp

Issue 1414553002: Fix out-of-memory crashes related to ArrayBuffer allocation Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase+more tweaks Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 switch (httpStatusCode) { 300 switch (httpStatusCode) {
301 case 403: 301 case 403:
302 return FileError::SECURITY_ERR; 302 return FileError::SECURITY_ERR;
303 case 404: 303 case 404:
304 return FileError::NOT_FOUND_ERR; 304 return FileError::NOT_FOUND_ERR;
305 default: 305 default:
306 return FileError::NOT_READABLE_ERR; 306 return FileError::NOT_READABLE_ERR;
307 } 307 }
308 } 308 }
309 309
310 PassRefPtr<DOMArrayBuffer> FileReaderLoader::arrayBufferResult() const 310 PassRefPtr<DOMArrayBuffer> FileReaderLoader::arrayBufferResultOrNull() const
311 { 311 {
312 ASSERT(m_readType == ReadAsArrayBuffer); 312 ASSERT(m_readType == ReadAsArrayBuffer);
313 313
314 // If the loading is not started or an error occurs, return an empty result. 314 // If the loading is not started or an error occurs, return an empty result.
315 if (!m_rawData || m_errorCode) 315 if (!m_rawData || m_errorCode)
316 return nullptr; 316 return nullptr;
317 317
318 return DOMArrayBuffer::create(m_rawData->toArrayBuffer()); 318 return DOMArrayBuffer::createOrNull(m_rawData->toArrayBuffer());
319 } 319 }
320 320
321 String FileReaderLoader::stringResult() 321 String FileReaderLoader::stringResult()
322 { 322 {
323 ASSERT(m_readType != ReadAsArrayBuffer && m_readType != ReadByClient); 323 ASSERT(m_readType != ReadAsArrayBuffer && m_readType != ReadByClient);
324 324
325 // If the loading is not started or an error occurs, return an empty result. 325 // If the loading is not started or an error occurs, return an empty result.
326 if (!m_rawData || m_errorCode) 326 if (!m_rawData || m_errorCode)
327 return m_stringResult; 327 return m_stringResult;
328 328
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 m_stringResult = builder.toString(); 401 m_stringResult = builder.toString();
402 } 402 }
403 403
404 void FileReaderLoader::setEncoding(const String& encoding) 404 void FileReaderLoader::setEncoding(const String& encoding)
405 { 405 {
406 if (!encoding.isEmpty()) 406 if (!encoding.isEmpty())
407 m_encoding = WTF::TextEncoding(encoding); 407 m_encoding = WTF::TextEncoding(encoding);
408 } 408 }
409 409
410 } // namespace blink 410 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/fileapi/FileReaderLoader.h ('k') | third_party/WebKit/Source/core/fileapi/FileReaderSync.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698