diff options
author | Dan McGee <dan@archlinux.org> | 2011-08-09 00:05:25 +0200 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2011-08-09 00:05:25 +0200 |
commit | 8fa330335f9eb465724ed778464502f844e930ae (patch) | |
tree | 2161500fbdc1ca52f0e1bf15c9f0ab90737d5d01 /src/pacman/sync.c | |
parent | ef4757afa5d31ff6a6c09e3410c889f152826f4f (diff) | |
parent | 67445334e71eaf6138561eee8e5561733a59fc69 (diff) | |
download | pacman-8fa330335f9eb465724ed778464502f844e930ae.tar.gz pacman-8fa330335f9eb465724ed778464502f844e930ae.tar.xz |
Merge branch 'maint'
Conflicts:
lib/libalpm/dload.c
lib/libalpm/po/fi.po
lib/libalpm/po/libalpm.pot
po/de.po
po/fi.po
src/pacman/po/pacman.pot
src/pacman/util.c
Diffstat (limited to 'src/pacman/sync.c')
-rw-r--r-- | src/pacman/sync.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 42a99020..3846b303 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -628,7 +628,15 @@ static int process_group(alpm_list_t *dbs, const char *group) group); select_display(pkgs); char *array = malloc(count); - multiselect_question(array, count); + if(!array) { + ret = 1; + goto cleanup; + } + if(multiselect_question(array, count)) { + ret = 1; + free(array); + goto cleanup; + } int n = 0; for(i = pkgs; i; i = alpm_list_next(i)) { if(array[n++] == 0) @@ -641,6 +649,7 @@ static int process_group(alpm_list_t *dbs, const char *group) goto cleanup; } } + free(array); } else { for(i = pkgs; i; i = alpm_list_next(i)) { alpm_pkg_t *pkg = alpm_list_getdata(i); |