[pacman-dev] [PATCH v3] libalpm: clone data on alpm_db_set_servers
Every alpm_option_set function clones the input so lets be more consistent. Also this fixes servers not being sanatized. --- v2: fix copy paste error --- lib/libalpm/alpm.h | 4 +--- lib/libalpm/db.c | 8 +++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 65b8e2fb..e6aefd4c 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1312,9 +1312,7 @@ alpm_list_t *alpm_db_get_servers(const alpm_db_t *db); /** Sets the list of servers for the database to use. * @param db the database to set the servers - * @param servers a char* list of servers. Note: the database will - * take ownership of the list and it should no longer be - * freed by the caller + * @param servers a char* list of servers. */ int alpm_db_set_servers(alpm_db_t *db, alpm_list_t *servers); diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 8511bb83..b8d1b157 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -139,9 +139,15 @@ alpm_list_t SYMEXPORT *alpm_db_get_servers(const alpm_db_t *db) int SYMEXPORT alpm_db_set_servers(alpm_db_t *db, alpm_list_t *servers) { + alpm_list_t *i; ASSERT(db != NULL, return -1); FREELIST(db->servers); - db->servers = servers; + for(i = servers; i; i = i->next) { + char *url = i->data; + if(alpm_db_add_server(db, url) != 0) { + return -1; + } + } return 0; } -- 2.31.1
participants (1)
-
morganamilo