[llvm] r184434 - Fix get_magic() handling of short reads.

[Evgeniy Stepanov]

Author: eugenis
Date: Thu Jun 20 10:56:05 2013
New Revision: 184434

URL: http://llvm.org/viewvc/llvm-project?rev=184434&view=rev
Log:
Fix get_magic() handling of short reads.

PR16389

Modified:
    llvm/trunk/lib/Support/Unix/PathV2.inc

Modified: llvm/trunk/lib/Support/Unix/PathV2.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Unix/PathV2.inc?rev=184434&r1=184433&r2=184434&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Unix/PathV2.inc (original)
+++ llvm/trunk/lib/Support/Unix/PathV2.inc Thu Jun 20 10:56:05 2013
@@ -694,7 +694,7 @@ error_code get_magic(const Twine &path,
   if (std::ferror(file) != 0) {
     std::fclose(file);
     return error_code(errno, system_category());
-  } else if (size != result.size()) {
+  } else if (size != len) {
     if (std::feof(file) != 0) {
       std::fclose(file);
       result.set_size(size);
@@ -702,7 +702,7 @@ error_code get_magic(const Twine &path,
     }
   }
   std::fclose(file);
-  result.set_size(len);
+  result.set_size(size);
   return error_code::success();
 }