diff options
| author | Allan McRae <allan@archlinux.org> | 2015-01-21 05:27:25 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2015-01-21 05:27:25 +0100 |
| commit | 92febc847cf60b12706c64e4786dae909a9396ac (patch) | |
| tree | 44771538071061e92efb011e7150ac7c788a6d60 | |
| parent | 018fa2b48c95492312ff3830b368a1f6036d6cf6 (diff) | |
| parent | c6263da168f7d612ea221e868fe42ad2ed706fa9 (diff) | |
| download | pacman-92febc847cf60b12706c64e4786dae909a9396ac.tar.gz pacman-92febc847cf60b12706c64e4786dae909a9396ac.tar.xz | |
Merge branch 'maint'
| -rw-r--r-- | lib/libalpm/be_local.c | 2 | ||||
| -rw-r--r-- | lib/libalpm/util.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 2454cdcb..300660b6 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -789,7 +789,7 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) while(safe_fgets(line, sizeof(line), fp) && (len = _alpm_strip_newline(line, 0))) { if(!_alpm_greedy_grow((void **)&files, &files_size, - (files_size ? files_size + sizeof(alpm_file_t) : 8 * sizeof(alpm_file_t)))) { + (files_count ? (files_count + 1) * sizeof(alpm_file_t) : 8 * sizeof(alpm_file_t)))) { goto error; } /* since we know the length of the file string already, diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 22408d70..ffd3c73d 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1328,7 +1328,7 @@ void *_alpm_greedy_grow(void **data, size_t *current, const size_t required) return NULL; } - return _alpm_realloc(data, current, required); + return _alpm_realloc(data, current, newsize); } void _alpm_alloc_fail(size_t size) |