emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps-rindex: clean: fix a regression introduced yesterday (use-after-free).

Browse Source
This commit is contained in:
Juan RP 2013-11-28 11:29:48 +01:00
parent dce26db1de
commit 30a500b5b3
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/xbps-rindex/index-clean.c
View File

@ -115,8 +115,7 @@ index_clean(struct xbps_handle *xhp, const char *repodir)
struct cbdata cbd; struct cbdata cbd;
xbps_array_t allkeys; xbps_array_t allkeys;
xbps_dictionary_t idx, idxfiles; xbps_dictionary_t idx, idxfiles;
const char *keyname; char *keyname, *pkgname;
char *pkgname;
int rv = 0; int rv = 0;
bool flush = false; bool flush = false;
@ -145,13 +144,14 @@ index_clean(struct xbps_handle *xhp, const char *repodir)
allkeys = xbps_dictionary_all_keys(idx); allkeys = xbps_dictionary_all_keys(idx);
rv = xbps_array_foreach_cb_multi(xhp, allkeys, idx, idx_cleaner_cb, &cbd); rv = xbps_array_foreach_cb_multi(xhp, allkeys, idx, idx_cleaner_cb, &cbd);
for (unsigned int x = 0; x < xbps_array_count(cbd.result); x++) { for (unsigned int x = 0; x < xbps_array_count(cbd.result); x++) {
xbps_array_get_cstring_nocopy(cbd.result, x, &keyname); xbps_array_get_cstring(cbd.result, x, &keyname);
printf("index-files: removed entry %s\n", keyname); printf("index-files: removed entry %s\n", keyname);
printf("index: removed entry %s\n", keyname); printf("index: removed entry %s\n", keyname);
pkgname = xbps_pkg_name(keyname); pkgname = xbps_pkg_name(keyname);
xbps_dictionary_remove(idx, pkgname);
xbps_dictionary_remove(idxfiles, keyname); xbps_dictionary_remove(idxfiles, keyname);
xbps_dictionary_remove(idx, pkgname);
free(pkgname); free(pkgname);
free(keyname);
flush = true; flush = true;
} }
/* /*
@ -164,9 +164,10 @@ index_clean(struct xbps_handle *xhp, const char *repodir)
allkeys = xbps_dictionary_all_keys(idxfiles); allkeys = xbps_dictionary_all_keys(idxfiles);
rv = xbps_array_foreach_cb_multi(xhp, allkeys, idxfiles, idxfiles_cleaner_cb, &cbd); rv = xbps_array_foreach_cb_multi(xhp, allkeys, idxfiles, idxfiles_cleaner_cb, &cbd);
for (unsigned int x = 0; x < xbps_array_count(cbd.result); x++) { for (unsigned int x = 0; x < xbps_array_count(cbd.result); x++) {
xbps_array_get_cstring_nocopy(cbd.result, x, &keyname); xbps_array_get_cstring(cbd.result, x, &keyname);
printf("index-files: removed entry %s\n", keyname); printf("index-files: removed entry %s\n", keyname);
xbps_dictionary_remove(idxfiles, keyname); xbps_dictionary_remove(idxfiles, keyname);
free(keyname);
flush = true; flush = true;
} }