1 files changed, 6 insertions, 4 deletions
diff --git a/lib/VMCore/Core.cpp b/lib/VMCore/Core.cpp
index a4c77a2670..6bad2f3f44 100644
--- a/lib/VMCore/Core.cpp
+++ b/lib/VMCore/Core.cpp
@@ -2221,9 +2221,10 @@ LLVMBool LLVMCreateMemoryBufferWithContentsOfFile(
     LLVMMemoryBufferRef *OutMemBuf,
     char **OutMessage) {
 
+  OwningPtr<MemoryBuffer> MB;
   error_code ec;
-  if (MemoryBuffer *MB = MemoryBuffer::getFile(Path, ec)) {
-    *OutMemBuf = wrap(MB);
+  if (!(ec = MemoryBuffer::getFile(Path, MB))) {
+    *OutMemBuf = wrap(MB.take());
     return 0;
   }
 
@@ -2233,9 +2234,10 @@ LLVMBool LLVMCreateMemoryBufferWithContentsOfFile(
 
 LLVMBool LLVMCreateMemoryBufferWithSTDIN(LLVMMemoryBufferRef *OutMemBuf,
                                          char **OutMessage) {
+  OwningPtr<MemoryBuffer> MB;
   error_code ec;
-  if (MemoryBuffer *MB = MemoryBuffer::getSTDIN(ec)) {
-    *OutMemBuf = wrap(MB);
+  if (!(ec = MemoryBuffer::getSTDIN(MB))) {
+    *OutMemBuf = wrap(MB.take());
     return 0;
   }