1 files changed, 7 insertions, 2 deletions
diff --git a/lib/Support/MemoryBuffer.cpp b/lib/Support/MemoryBuffer.cpp
index 2b95089b52..ac79518903 100644
--- a/lib/Support/MemoryBuffer.cpp
+++ b/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();