Skip to content

Commit b94afb4

Browse files
committed
chore(lint): route the DeusData#2134 root-owner scratch through the memory core
The memory-core ratchet flagged src/mcp/mcp.c growing by 10 raw allocator sites (784 -> 794) from index_root_owner_resolve and its caller. The owner list buffer, which this code allocates and frees itself, now uses cbm_realloc/cbm_free (class other). Strings handed over by other APIs (cbm_project_name_from_path, heap_strdup, the index argument strings) are released through safe_free, as elsewhere in the file, so no memory the core never counted reaches cbm_free. Behaviour is unchanged; mcp.c is back at its baseline of 784. Signed-off-by: Martin Vogel <martin.vogel.tech@gmail.com>
1 parent 155d147 commit b94afb4

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

‎src/mcp/mcp.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11272,7 +11272,7 @@ static bool index_root_owner_append(char **list, size_t *len, size_t *cap, const
1127211272
size_t need = *len + strlen(name) + 3;
1127311273
if (need > *cap) {
1127411274
size_t grown_cap = need * 2;
11275-
char *grown = realloc(*list, grown_cap);
11275+
char *grown = cbm_realloc(CBM_MEM_CLASS_OTHER, *list, grown_cap);
1127611276
if (!grown) {
1127711277
return false;
1127811278
}
@@ -11293,14 +11293,14 @@ static bool index_root_owner_resolve(const char *repo_path, char **owner_out, ch
1129311293
char derived_db[CBM_SZ_1K];
1129411294
project_db_path(derived, derived_db, sizeof(derived_db));
1129511295
if (derived_db[0] && cbm_file_exists(derived_db)) {
11296-
free(derived);
11296+
safe_free(derived);
1129711297
return true; /* fast path: the path-derived project is already on disk */
1129811298
}
1129911299
char dir_path[CBM_SZ_1K];
1130011300
cache_dir(dir_path, sizeof(dir_path));
1130111301
cbm_dir_t *d = cbm_opendir(dir_path);
1130211302
if (!d) {
11303-
free(derived);
11303+
safe_free(derived);
1130411304
return true;
1130511305
}
1130611306
char *owner = NULL;
@@ -11339,16 +11339,16 @@ static bool index_root_owner_resolve(const char *repo_path, char **owner_out, ch
1133911339
project_record_clear(&record);
1134011340
}
1134111341
cbm_closedir(d);
11342-
free(derived);
11342+
safe_free(derived);
1134311343

1134411344
if (ok && !derived_exists && owner_count == 1) {
11345-
free(owners);
11345+
cbm_free(CBM_MEM_CLASS_OTHER, owners);
1134611346
*owner_out = owner;
1134711347
return true;
1134811348
}
11349-
free(owner);
11349+
safe_free(owner);
1135011350
if (ok && (derived_exists || owner_count == 0)) {
11351-
free(owners);
11351+
cbm_free(CBM_MEM_CLASS_OTHER, owners);
1135211352
return true;
1135311353
}
1135411354
char msg[CBM_SZ_4K];
@@ -11361,7 +11361,7 @@ static bool index_root_owner_resolve(const char *repo_path, char **owner_out, ch
1136111361
snprintf(msg, sizeof(msg), "out of memory while resolving the project for root_path %s",
1136211362
repo_path);
1136311363
}
11364-
free(owners);
11364+
cbm_free(CBM_MEM_CLASS_OTHER, owners);
1136511365
*error_out = heap_strdup(msg);
1136611366
return false;
1136711367
}
@@ -11524,12 +11524,12 @@ static char *handle_index_repository(cbm_mcp_server_t *srv, const char *args) {
1152411524
index_args_free(repo_path, mode_str, name_override);
1152511525
char *result = cbm_mcp_text_result(
1152611526
owner_error ? owner_error : "could not resolve index project name", true);
11527-
free(owner_error);
11527+
safe_free(owner_error);
1152811528
return result;
1152911529
}
1153011530
if (owner) {
1153111531
cbm_log_info("index.root_owner_reused", "root", repo_path, "project", owner);
11532-
free(name_override);
11532+
safe_free(name_override);
1153311533
name_override = owner;
1153411534
}
1153511535
}

0 commit comments

Comments
 (0)