fix(cross-repo): harden Maven library cleanup and growth

Author: nvt-pankajsharma

src/pipeline/pass_cross_repo.c

@@ -47,6 +47,25 @@ static const char *cr_itoa(int v) {
     return cr_ibuf;
 }
 
+bool cbm_cross_repo_project_list_alloc(char ***out, int cap, void *(*malloc_fn)(size_t)) {
+    if (!out) {
+        return false;
+    }
+    *out = NULL;
+    if (cap <= 0 || !malloc_fn) {
+        return false;
+    }
+    if ((size_t)cap > SIZE_MAX / sizeof(char *)) {
+        return false;
+    }
+    char **items = malloc_fn((size_t)cap * sizeof(*items));
+    if (!items) {
+        return false;
+    }
+    *out = items;
+    return true;
+}
+
 /* ── Helpers ─────────────────────────────────────────────────────── */
 
 static const char *cr_cache_dir(void) {
@@ -114,16 +133,14 @@ static void delete_cross_edges(cbm_store_t *store, const char *project) {
     cbm_store_delete_edges_by_type(store, project, "CROSS_GRAPHQL_CALLS");
     cbm_store_delete_edges_by_type(store, project, "CROSS_TRPC_CALLS");
     cbm_store_delete_edges_by_type(store, project, "CROSS_LIBRARY_DEPENDS_ON");
-    cbm_store_delete_edges_by_type(store, project, "CROSS_LIBRARY_USED_BY");
     struct sqlite3 *db = cbm_store_get_db(store);
     if (!db) {
         return;
     }
     sqlite3_stmt *st = NULL;
     if (sqlite3_prepare_v2(db,
-                           "DELETE FROM nodes WHERE project=?1 AND "
-                           "(qualified_name GLOB '__library__*' OR "
-                           "qualified_name GLOB '__library_consumer__*')",
+                           "DELETE FROM nodes WHERE project=?1 AND label='Library' "
+                           "AND qualified_name GLOB '__library__*'",
                            CBM_NOT_FOUND, &st, NULL) == SQLITE_OK) {
         sqlite3_bind_text(st, SKIP_ONE, project, CBM_NOT_FOUND, SQLITE_STATIC);
         sqlite3_step(st);
@@ -578,7 +595,12 @@ static int collect_all_projects(char ***out) {
 
     int cap = CR_INIT_CAP;
     int count = 0;
-    char **projects = malloc((size_t)cap * sizeof(char *));
+    char **projects = NULL;
+    if (!cbm_cross_repo_project_list_alloc(&projects, cap, malloc)) {
+        cbm_closedir(d);
+        *out = NULL;
+        return 0;
+    }
 
     cbm_dirent_t *ent;
     while ((ent = cbm_readdir(d)) != NULL) {
@@ -593,15 +615,25 @@ static int collect_all_projects(char ***out) {
             continue;
         }
         if (count >= cap) {
-            cap *= PAIR_LEN;
-            char **tmp = realloc(projects, (size_t)cap * sizeof(char *));
+            if (cap > INT32_MAX / PAIR_LEN) {
+                break;
+            }
+            int new_cap = cap * PAIR_LEN;
+            if ((size_t)new_cap > SIZE_MAX / sizeof(*projects)) {
+                break;
+            }
+            char **tmp = realloc(projects, (size_t)new_cap * sizeof(*projects));
             if (!tmp) {
                 break;
             }
+            cap = new_cap;
             projects = tmp;
         }
         /* Strip .db extension */
         projects[count] = malloc(len - PAIR_LEN);
+        if (!projects[count]) {
+            break;
+        }
         memcpy(projects[count], ent->name, len - CR_DB_EXT_LEN);
         projects[count][len - CR_DB_EXT_LEN] = '\0';
         count++;

src/pipeline/pass_cross_repo_maven.c

@@ -86,6 +86,9 @@ bool cbm_cross_repo_maven_grow_array(void **items, int *cap, size_t elem_size,
         return false;
     }
     int new_cap = *cap * PAIR_LEN;
+    if ((size_t)new_cap > SIZE_MAX / elem_size) {
+        return false;
+    }
     void *tmp = realloc_fn(*items, (size_t)new_cap * elem_size);
     if (!tmp) {
         return false;
@@ -370,12 +373,11 @@ static int list_pom_paths(cbm_store_t *store, const char *project, char ***out)
             continue;
         }
         if (count >= cap) {
-            cap *= PAIR_LEN;
-            char **tmp = realloc(paths, (size_t)cap * sizeof(char *));
-            if (!tmp) {
+            void *grown = paths;
+            if (!cbm_cross_repo_maven_grow_array(&grown, &cap, sizeof(*paths), realloc)) {
                 break;
             }
-            paths = tmp;
+            paths = grown;
         }
         paths[count] = malloc(strlen(path) + SKIP_ONE);
         if (paths[count]) {
@@ -438,16 +440,15 @@ static int collect_artifacts(cbm_store_t *store, const char *project, mcr_artifa
         }
         if (group && group[0] && artifact && artifact[0]) {
             if (count >= cap) {
-                cap *= PAIR_LEN;
-                mcr_artifact_t *tmp = realloc(items, (size_t)cap * sizeof(*items));
-                if (!tmp) {
+                void *grown = items;
+                if (!cbm_cross_repo_maven_grow_array(&grown, &cap, sizeof(*items), realloc)) {
                     free(parent_group);
                     free(group);
                     free(artifact);
                     free(xml);
                     break;
                 }
-                items = tmp;
+                items = grown;
             }
             memset(&items[count], 0, sizeof(items[count]));
             items[count].group_id = group;

tests/test_pipeline.c

@@ -17,6 +17,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
 #include <stdatomic.h>
 #include "foundation/compat_thread.h"
 #include <fcntl.h>
@@ -1284,13 +1285,41 @@ static void cleanup_cross_maven_fixture(cross_maven_fixture_t *fx) {
 
 extern bool cbm_cross_repo_maven_grow_array(void **items, int *cap, size_t elem_size,
                                             void *(*realloc_fn)(void *, size_t));
+extern bool cbm_cross_repo_project_list_alloc(char ***out, int cap,
+                                              void *(*malloc_fn)(size_t));
 
 static void *test_maven_realloc_fails(void *ptr, size_t size) {
     (void)ptr;
     (void)size;
     return NULL;
 }
 
+static int g_test_maven_realloc_calls;
+
+static void *test_maven_realloc_records_call(void *ptr, size_t size) {
+    (void)size;
+    g_test_maven_realloc_calls++;
+    return ptr;
+}
+
+static void *test_project_list_malloc_fails(size_t size) {
+    (void)size;
+    return NULL;
+}
+
+TEST(cross_repo_project_list_initial_alloc_failure_returns_empty) {
+    char **projects = (char **)1;
+
+    ASSERT_FALSE(cbm_cross_repo_project_list_alloc(&projects, 32, test_project_list_malloc_fails));
+    ASSERT_NULL(projects);
+
+    projects = (char **)1;
+    ASSERT_FALSE(cbm_cross_repo_project_list_alloc(&projects, 0, test_project_list_malloc_fails));
+    ASSERT_NULL(projects);
+
+    PASS();
+}
+
 TEST(cross_repo_maven_failed_growth_preserves_capacity) {
     int cap = 32;
     char *items = malloc((size_t)cap);
@@ -1307,6 +1336,24 @@ TEST(cross_repo_maven_failed_growth_preserves_capacity) {
     PASS();
 }
 
+TEST(cross_repo_maven_growth_rejects_byte_overflow_before_realloc) {
+    int cap = 2;
+    char *items = malloc(1);
+    ASSERT_NOT_NULL(items);
+    void *original = items;
+    g_test_maven_realloc_calls = 0;
+
+    ASSERT_FALSE(cbm_cross_repo_maven_grow_array(
+        (void **)&items, &cap, (SIZE_MAX / (size_t)(cap * PAIR_LEN)) + 1,
+        test_maven_realloc_records_call));
+    ASSERT_EQ(g_test_maven_realloc_calls, 0);
+    ASSERT_EQ(cap, 2);
+    ASSERT_EQ(items == original, 1);
+
+    free(items);
+    PASS();
+}
+
 TEST(cross_repo_maven_dependency_creates_library_edges) {
     const char *provider_pom = "<project><modelVersion>4.0.0</modelVersion>"
                                "<groupId>com.example.platform</groupId>"
@@ -1493,7 +1540,16 @@ TEST(cross_repo_maven_cleanup_preserves_unrelated_nodes) {
                             .start_line = 1,
                             .end_line = 1,
                             .properties_json = "{}"};
+    cbm_node_t prefixed_function = {.project = "consumer",
+                                    .label = "Function",
+                                    .name = "PrefixedFunction",
+                                    .qualified_name = "__library__manual_function_should_stay",
+                                    .file_path = "src/manual.c",
+                                    .start_line = 1,
+                                    .end_line = 1,
+                                    .properties_json = "{}"};
     ASSERT_GT(cbm_store_upsert_node(consumer, &unrelated), 0);
+    ASSERT_GT(cbm_store_upsert_node(consumer, &prefixed_function), 0);
     cbm_store_close(consumer);
 
     const char *targets[] = {"provider"};
@@ -1503,12 +1559,49 @@ TEST(cross_repo_maven_cleanup_preserves_unrelated_nodes) {
     consumer = cbm_store_open_path(fx.consumer_db);
     ASSERT_NOT_NULL(consumer);
     ASSERT_TRUE(node_exists_by_qn(consumer, "consumer", "xxlibraryzz_should_stay"));
+    ASSERT_TRUE(node_exists_by_qn(consumer, "consumer", "__library__manual_function_should_stay"));
     cbm_store_close(consumer);
 
     cleanup_cross_maven_fixture(&fx);
     PASS();
 }
 
+TEST(cross_repo_maven_provider_rerun_preserves_incoming_used_by) {
+    const char *provider_pom = "<project><modelVersion>4.0.0</modelVersion>"
+                               "<groupId>com.example.platform</groupId>"
+                               "<artifactId>shared-library</artifactId>"
+                               "<version>1.0.0</version></project>";
+    const char *consumer_pom =
+        "<project><modelVersion>4.0.0</modelVersion>"
+        "<groupId>app</groupId><artifactId>consumer</artifactId>"
+        "<dependencies><dependency><groupId>com.example.platform</groupId>"
+        "<artifactId>shared-library</artifactId><version>1.0.0</version>"
+        "</dependency></dependencies></project>";
+    cross_maven_fixture_t fx;
+    ASSERT_EQ(setup_cross_maven_fixture(&fx, provider_pom, consumer_pom), 0);
+
+    const char *provider_targets[] = {"provider"};
+    cbm_cross_repo_result_t result = cbm_cross_repo_match("consumer", provider_targets, 1);
+    ASSERT_EQ(result.library_edges, 1);
+
+    cbm_store_t *provider = cbm_store_open_path(fx.provider_db);
+    ASSERT_NOT_NULL(provider);
+    ASSERT_EQ(count_edges_by_type(provider, "provider", "CROSS_LIBRARY_USED_BY"), 1);
+    cbm_store_close(provider);
+
+    const char *consumer_targets[] = {"consumer"};
+    result = cbm_cross_repo_match("provider", consumer_targets, 1);
+    ASSERT_EQ(result.library_edges, 0);
+
+    provider = cbm_store_open_path(fx.provider_db);
+    ASSERT_NOT_NULL(provider);
+    ASSERT_EQ(count_edges_by_type(provider, "provider", "CROSS_LIBRARY_USED_BY"), 1);
+    cbm_store_close(provider);
+
+    cleanup_cross_maven_fixture(&fx);
+    PASS();
+}
+
 TEST(cross_repo_maven_removed_dependency_clears_provider_used_by) {
     const char *provider_pom = "<project><modelVersion>4.0.0</modelVersion>"
                                "<groupId>com.example.platform</groupId>"
@@ -6591,13 +6684,16 @@ SUITE(pipeline) {
     /* FastAPI Depends edge tracking (PR #66 port) */
     RUN_TEST(pipeline_fastapi_depends_edges);
     /* Cross-repo library dependency linking */
+    RUN_TEST(cross_repo_project_list_initial_alloc_failure_returns_empty);
     RUN_TEST(cross_repo_maven_failed_growth_preserves_capacity);
+    RUN_TEST(cross_repo_maven_growth_rejects_byte_overflow_before_realloc);
     RUN_TEST(cross_repo_maven_dependency_creates_library_edges);
     RUN_TEST(cross_repo_maven_dependency_escapes_library_edge_props);
     RUN_TEST(cross_repo_maven_dependency_management_does_not_create_library_edge);
     RUN_TEST(cross_repo_maven_commented_dependency_does_not_create_library_edge);
     RUN_TEST(cross_repo_maven_plugin_dependency_does_not_create_library_edge);
     RUN_TEST(cross_repo_maven_cleanup_preserves_unrelated_nodes);
+    RUN_TEST(cross_repo_maven_provider_rerun_preserves_incoming_used_by);
     RUN_TEST(cross_repo_maven_removed_dependency_clears_provider_used_by);
     RUN_TEST(cross_repo_maven_long_coordinates_do_not_collide);
     RUN_TEST(cross_repo_maven_fixture_restores_cache_dir);