commit-graph: check order while reading fanout chunk

[thirdparty/git.git] / commit-graph.c

diff --git a/commit-graph.c b/commit-graph.c
index a7d2fe883fd2f714f31ad8a547aec7e3d27798ea..e5f9e75e185d8bb2b5a93480aa33051930fa3cd7 100644 (file)
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -277,8 +277,6 @@ struct commit_graph *load_commit_graph_one_fd_st(struct repository *r,
 
 static int verify_commit_graph_lite(struct commit_graph *g)
 {
-       int i;
-
        /*
         * Basic validation shared between parse_commit_graph()
         * which'll be called every time the graph is used, and the
@@ -291,16 +289,6 @@ static int verify_commit_graph_lite(struct commit_graph *g)
         * over g->num_commits, or runs a checksum on the commit-graph
         * itself.
         */
-       for (i = 0; i < 255; i++) {
-               uint32_t oid_fanout1 = ntohl(g->chunk_oid_fanout[i]);
-               uint32_t oid_fanout2 = ntohl(g->chunk_oid_fanout[i + 1]);
-
-               if (oid_fanout1 > oid_fanout2) {
-                       error("commit-graph fanout values out of order");
-                       return 1;
-               }
-       }
-
        return 0;
 }
 
@@ -308,10 +296,23 @@ static int graph_read_oid_fanout(const unsigned char *chunk_start,
                                 size_t chunk_size, void *data)
 {
        struct commit_graph *g = data;
+       int i;
+
        if (chunk_size != 256 * sizeof(uint32_t))
                return error("commit-graph oid fanout chunk is wrong size");
        g->chunk_oid_fanout = (const uint32_t *)chunk_start;
        g->num_commits = ntohl(g->chunk_oid_fanout[255]);
+
+       for (i = 0; i < 255; i++) {
+               uint32_t oid_fanout1 = ntohl(g->chunk_oid_fanout[i]);
+               uint32_t oid_fanout2 = ntohl(g->chunk_oid_fanout[i + 1]);
+
+               if (oid_fanout1 > oid_fanout2) {
+                       error("commit-graph fanout values out of order");
+                       return 1;
+               }
+       }
+
        return 0;
 }