diff options
author | Dan Gohman <gohman@apple.com> | 2010-05-27 17:31:51 +0000 |
---|---|---|
committer | Dan Gohman <gohman@apple.com> | 2010-05-27 17:31:51 +0000 |
commit | c36b1f35f08c82130f13caad0dd5eaa7ef3259aa (patch) | |
tree | 05843d376cf29925693034ef5e2b9f8844d7e3c7 /llvm/lib/Support | |
parent | ece4bf5148f641d695458d252ce49bcb81b44571 (diff) | |
download | bcm5719-llvm-c36b1f35f08c82130f13caad0dd5eaa7ef3259aa.tar.gz bcm5719-llvm-c36b1f35f08c82130f13caad0dd5eaa7ef3259aa.zip |
Add basic error checking to MemoryBuffer::getSTDIN.
llvm-svn: 104855
Diffstat (limited to 'llvm/lib/Support')
-rw-r--r-- | llvm/lib/Support/MemoryBuffer.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/llvm/lib/Support/MemoryBuffer.cpp b/llvm/lib/Support/MemoryBuffer.cpp index 2b95089b524..ac795189036 100644 --- a/llvm/lib/Support/MemoryBuffer.cpp +++ b/llvm/lib/Support/MemoryBuffer.cpp @@ -137,7 +137,7 @@ MemoryBuffer *MemoryBuffer::getFileOrSTDIN(StringRef Filename, int64_t FileSize, struct stat *FileInfo) { if (Filename == "-") - return getSTDIN(); + return getSTDIN(ErrStr); return getFile(Filename, ErrStr, FileSize, FileInfo); } @@ -263,7 +263,7 @@ public: }; } -MemoryBuffer *MemoryBuffer::getSTDIN() { +MemoryBuffer *MemoryBuffer::getSTDIN(std::string *ErrStr) { char Buffer[4096*4]; std::vector<char> FileData; @@ -279,6 +279,11 @@ MemoryBuffer *MemoryBuffer::getSTDIN() { FileData.insert(FileData.end(), Buffer, Buffer+ReadBytes); } while (ReadBytes == sizeof(Buffer)); + if (!feof(stdin)) { + if (ErrStr) *ErrStr = "error reading from stdin"; + return 0; + } + FileData.push_back(0); // &FileData[Size] is invalid. So is &*FileData.end(). size_t Size = FileData.size(); MemoryBuffer *B = new STDINBufferFile(); |