diff options
| author | Allan McRae <allan@archlinux.org> | 2014-12-24 01:54:28 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-12-24 02:19:30 +0100 |
| commit | 2114ef18742142a7eb1df367558967a754be8059 (patch) | |
| tree | 065f14d188023efb584c3fe55321e18119dddf04 | |
| parent | 9cf1b2c00432420499c0f1031d15ebccd23b2ae9 (diff) | |
| download | pacman-2114ef18742142a7eb1df367558967a754be8059.tar.gz pacman-2114ef18742142a7eb1df367558967a754be8059.tar.xz | |
conflict_new: free memory on error
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | lib/libalpm/conflict.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 6402ab3d..40cbb953 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -52,11 +52,15 @@ static alpm_conflict_t *conflict_new(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, conflict->package1_hash = pkg1->name_hash; conflict->package2_hash = pkg2->name_hash; - STRDUP(conflict->package1, pkg1->name, return NULL); - STRDUP(conflict->package2, pkg2->name, return NULL); + STRDUP(conflict->package1, pkg1->name, goto error); + STRDUP(conflict->package2, pkg2->name, goto error); conflict->reason = reason; return conflict; + +error: + alpm_conflict_free(conflict); + return NULL; } /** |