summaryrefslogtreecommitdiffstats
path: root/src/state.cc
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2015-03-19 23:42:06 (GMT)
committerNico Weber <nicolasweber@gmx.de>2015-03-19 23:42:06 (GMT)
commitf5c5789aad8001e15a7e4f1ee0dee0c2b688e993 (patch)
tree9e26b5bbf6486a710eba81c0d0214b2fb3f3e348 /src/state.cc
parent20a840539ce87a343b414f52a3330706a731b044 (diff)
downloadNinja-f5c5789aad8001e15a7e4f1ee0dee0c2b688e993.zip
Ninja-f5c5789aad8001e15a7e4f1ee0dee0c2b688e993.tar.gz
Ninja-f5c5789aad8001e15a7e4f1ee0dee0c2b688e993.tar.bz2
Another crash fix for duplicate edges. Fixes #939.
Patch #933 fixed a crash with duplicate edges by not adding edges to the graph if all the edge's outputs are already built by other edges. However, it added the edge to the out_edges of the edge's input nodes before deleting it, letting inputs refer to dead edges. To fix, move the check for deleting an edge above the code that adds inputs. Expand VerifyGraph() to check that nodes don't refer to edges that aren't present in the state.
Diffstat (limited to 'src/state.cc')
-rw-r--r--src/state.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/state.cc b/src/state.cc
index 18c0c8c..0426b85 100644
--- a/src/state.cc
+++ b/src/state.cc
@@ -61,6 +61,7 @@ void Pool::Dump() const {
}
}
+// static
bool Pool::WeightedEdgeCmp(const Edge* a, const Edge* b) {
if (!a) return b;
if (!b) return false;