summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/fileapi/FileReader.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/fileapi/FileReader.cpp')
-rw-r--r--Source/WebCore/fileapi/FileReader.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/WebCore/fileapi/FileReader.cpp b/Source/WebCore/fileapi/FileReader.cpp
index ab7c2b3b2..bdae05942 100644
--- a/Source/WebCore/fileapi/FileReader.cpp
+++ b/Source/WebCore/fileapi/FileReader.cpp
@@ -250,15 +250,16 @@ void FileReader::fireEvent(const AtomicString& type)
PassRefPtr<ArrayBuffer> FileReader::arrayBufferResult() const
{
- return m_loader ? m_loader->arrayBufferResult() : 0;
+ if (!m_loader || m_error)
+ return 0;
+ return m_loader->arrayBufferResult();
}
String FileReader::stringResult()
{
- String ret = m_loader ? m_loader->stringResult() : "";
- if (ret.isEmpty())
+ if (!m_loader || m_error)
return String();
- return ret;
+ return m_loader->stringResult();
}
} // namespace WebCore