From be5fa31841f7005650c4335e99c407fdfa487ee4 Mon Sep 17 00:00:00 2001
From: Evgeniy Stepanov <eugeni.stepanov@gmail.com>
Date: Thu, 20 Jun 2013 15:56:05 +0000
Subject: [PATCH] Fix get_magic() handling of short reads.
PR16389
llvm-svn: 184434
---
lib/Support/Unix/PathV2.inc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/Support/Unix/PathV2.inc b/lib/Support/Unix/PathV2.inc
index 9602daad08f..39b33123de8 100644
--- a/lib/Support/Unix/PathV2.inc
+++ b/lib/Support/Unix/PathV2.inc
@@ -694,7 +694,7 @@ error_code get_magic(const Twine &path, uint32_t len,
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, uint32_t len,
}
}
std::fclose(file);
- result.set_size(len);
+ result.set_size(size);
return error_code::success();
}