lei.chen/myxce
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: get_default_conf bypass load_cluster_config to avoid dangling hook pointer (UAF)

Browse source
This commit is contained in:
Rongsong Shen 2026-05-13 16:13:26 +00:00
parent 6141264219
commit 8d86a1bcfe
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/controller/myconf.c
View file

@ -139,17 +139,17 @@ int load_cluster_config(cluster_t* c,
cluster_config_t* get_default_conf(void* cl) cluster_config_t* get_default_conf(void* cl)
{ {
cluster_t* cls = (cluster_t*)cl; cluster_t* cls = (cluster_t*)cl;
struct cluster_configuration* cf = NULL; cluster_config_t* cfg = NULL;
if (load_cluster_config(cls, &cf) != 0 || cf == NULL) { int rc = load_cluster_config_from_file(cls->myconf->conffile, &cfg);
PERROR("load_cluster_config"); if (rc < 0 || cfg == NULL) {
PERROR("load_cluster_config_from_file");
return NULL; return NULL;
} }
cluster_config_t *result = cf->cluster; fill_default_cluster_config(cfg);
free(cf); /* free the wrapper; result (cf->cluster) is caller-owned */ return cfg;
return result;
} }
/* ── load_primary_config ────────────────────────── */ /* ── load_primary_config ────────────────────────── */