diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2013-04-29 07:36:34 (GMT) |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2013-04-29 07:37:48 (GMT) |
| commit | 2b26bf2bda4b13e6c560c07e7ab20bf6abfed53e (patch) | |
| tree | 4f25035dbc02a90598cd7974e8c3fb8b723486bc /src/deps_log.cc | |
| parent | 3699cb6aa2fb29125bf725cb50fbcc593da8a8a1 (diff) | |
| download | Ninja-2b26bf2bda4b13e6c560c07e7ab20bf6abfed53e.zip Ninja-2b26bf2bda4b13e6c560c07e7ab20bf6abfed53e.tar.gz Ninja-2b26bf2bda4b13e6c560c07e7ab20bf6abfed53e.tar.bz2 | |
Don't crash during deps log recompaction if there's more than one deps entry.
Part of issue #554.
Diffstat (limited to 'src/deps_log.cc')
| -rw-r--r-- | src/deps_log.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/deps_log.cc b/src/deps_log.cc index c52503b..5ecdeef 100644 --- a/src/deps_log.cc +++ b/src/deps_log.cc @@ -257,6 +257,8 @@ bool DepsLog::Recompact(const string& path, string* err) { // Write out all deps again. for (int old_id = 0; old_id < (int)deps_.size(); ++old_id) { Deps* deps = deps_[old_id]; + if (!deps) continue; // If nodes_[old_id] is a leaf, it has no deps. + if (!new_log.RecordDeps(nodes_[old_id], deps->mtime, deps->node_count, deps->nodes)) { new_log.Close(); |