diff --git a/src/build_log.cc b/src/build_log.cc index 97c33442cd..720b4b4d0e 100644 --- a/src/build_log.cc +++ b/src/build_log.cc @@ -223,7 +223,8 @@ bool BuildLog::Load(const string& path, string* err) { int total_entry_count = 0; LineReader reader(file); - char* line_start, *line_end; + char* line_start = 0; + char* line_end = 0; while (reader.ReadLine(&line_start, &line_end)) { if (!log_version) { log_version = 1; // Assume by default. @@ -295,6 +296,11 @@ bool BuildLog::Load(const string& path, string* err) { entry->command_hash = LogEntry::HashCommand(StringPiece(start, end - start)); } + fclose(file); + + if (!line_start) { + return true; // file was empty + } // Decide whether it's time to rebuild the log: // - if we're upgrading versions @@ -308,8 +314,6 @@ bool BuildLog::Load(const string& path, string* err) { needs_recompaction_ = true; } - fclose(file); - return true; }