commit 7c80007b55fd42cdd56b06cb4330fb8ceb468e09
author Logan Chien <loganchien@google.com> Mon Oct 16 14:04:34 2017 +0800
committer Logan Chien <loganchien@google.com> Mon Oct 16 14:04:34 2017 +0800
tree 352bfffc96a13fe85faeaf2c463ca80161e7f3bd
parent 887eccf1fdd91d50c4761bba79b5cf329a280ffb

Fix potential buffer overrun

This commit rearranges record size comparison and fread() to make sure
fread() only reads the data that can fit into the buffer.

src/deps_log.cc

diff --git a/src/deps_log.cc b/src/deps_log.cc
index 89c6023..8734dd7 100644
--- a/src/deps_log.cc
+++ b/src/deps_log.cc
@@ -209,7 +209,7 @@
     bool is_deps = (size >> 31) != 0;
     size = size & 0x7FFFFFFF;
 
-    if (fread(buf, size, 1, f) < 1 || size > kMaxRecordSize) {
+    if (size > kMaxRecordSize || fread(buf, size, 1, f) < 1) {
       read_failed = true;
       break;
     }