moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-03-03 10:51:47 -05:00
Code Issues Releases Wiki Activity

Fix memory leak and error code in DB reading

Browse Source 
We were returning a package error code rather than a DB one, and we
would leak the archive memory if the database file didn't exist.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-01-24 21:46:42 -06:00
parent 0f24390fe8
commit fe76c353af
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libalpm/be_sync.c
View File

@ -166,7 +166,8 @@ static int sync_db_populate(pmdb_t *db)
ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
_alpm_log(PM_LOG_ERROR, _("could not open %s: %s\n"), _alpm_db_path(db), _alpm_log(PM_LOG_ERROR, _("could not open %s: %s\n"), _alpm_db_path(db),
archive_error_string(archive)); archive_error_string(archive));
RET_ERR(PM_ERR_PKG_OPEN, 1); archive_read_finish(archive);
RET_ERR(PM_ERR_DB_OPEN, 1);
} }
while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) { while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) {
@ -180,7 +181,7 @@ static int sync_db_populate(pmdb_t *db)
pkg = _alpm_pkg_new(); pkg = _alpm_pkg_new();
if(pkg == NULL) { if(pkg == NULL) {
archive_read_finish(archive); archive_read_finish(archive);
return(-1); RET_ERR(PM_ERR_MEMORY, -1);
} }
name = archive_entry_pathname(entry); name = archive_entry_pathname(entry);