diff options
| author | Aurelien Foret <aurelien@archlinux.org> | 2006-01-06 23:58:01 +0100 |
|---|---|---|
| committer | Aurelien Foret <aurelien@archlinux.org> | 2006-01-06 23:58:01 +0100 |
| commit | db8a5e358617038b3e884a13462a4f0163b56cc5 (patch) | |
| tree | 5645a2e7bdc3d5a404db079689c1bde766a1ce75 /lib/libalpm/add.c | |
| parent | c2b27b58804b9a33a8dd13f62a192f5154416d0d (diff) | |
| download | pacman-db8a5e358617038b3e884a13462a4f0163b56cc5.tar.gz pacman-db8a5e358617038b3e884a13462a4f0163b56cc5.tar.xz | |
- sync: populates *data when a conflict can't be resolved
- add: code cleanup
Diffstat (limited to 'lib/libalpm/add.c')
| -rw-r--r-- | lib/libalpm/add.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index b7f1aa90..8f3d03ce 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -242,7 +242,11 @@ int add_prepare(pmtrans_t *trans, pmdb_t *db, PMList **data) if(!errorout) { errorout = 1; } - MALLOC(miss, sizeof(pmdepmissing_t)); + if((miss = (pmdepmissing_t *)malloc(sizeof(pmdepmissing_t))) == NULL) { + FREELIST(lp); + FREELIST(*data); + RET_ERR(PM_ERR_MEMORY, -1); + } *miss = *(pmdepmissing_t*)i->data; *data = pm_list_add(*data, miss); } |