mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
initialize pointers passed to _alpm_pkg_dup
_alpm_pkg_dup leaves the destination pointer unaltered in case of fatal errors, so when commits2f0ca00e
andbe4198b3
freed the pointer, they fixed a memory leak on non-fatal errors by replacing it with a segmentation fault on fatal errors. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
4060c5c77f
commit
8da9be0955
@ -565,7 +565,7 @@ alpm_list_t *_alpm_db_get_pkgcache(alpm_db_t *db)
|
||||
/* "duplicate" pkg then add it to pkgcache */
|
||||
int _alpm_db_add_pkgincache(alpm_db_t *db, alpm_pkg_t *pkg)
|
||||
{
|
||||
alpm_pkg_t *newpkg;
|
||||
alpm_pkg_t *newpkg = NULL;
|
||||
|
||||
if(db == NULL || pkg == NULL || !(db->status & DB_STATUS_PKGCACHE)) {
|
||||
return -1;
|
||||
|
@ -609,7 +609,7 @@ int _alpm_recursedeps(alpm_db_t *db, alpm_list_t **targs, int include_explicit)
|
||||
alpm_pkg_t *deppkg = j->data;
|
||||
if(_alpm_pkg_depends_on(pkg, deppkg)
|
||||
&& can_remove_package(db, deppkg, *targs, include_explicit)) {
|
||||
alpm_pkg_t *copy;
|
||||
alpm_pkg_t *copy = NULL;
|
||||
_alpm_log(db->handle, ALPM_LOG_DEBUG, "adding '%s' to the targets\n",
|
||||
deppkg->name);
|
||||
/* add it to the target list */
|
||||
|
Loading…
Reference in New Issue
Block a user