_alpm_conflict_dup: fix memory leak on error
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
46459da39b
commit
27506aba8f
1 changed files with 6 additions and 2 deletions
|
@ -79,11 +79,15 @@ alpm_conflict_t *_alpm_conflict_dup(const alpm_conflict_t *conflict)
|
||||||
|
|
||||||
newconflict->package1_hash = conflict->package1_hash;
|
newconflict->package1_hash = conflict->package1_hash;
|
||||||
newconflict->package2_hash = conflict->package2_hash;
|
newconflict->package2_hash = conflict->package2_hash;
|
||||||
STRDUP(newconflict->package1, conflict->package1, return NULL);
|
STRDUP(newconflict->package1, conflict->package1, goto error);
|
||||||
STRDUP(newconflict->package2, conflict->package2, return NULL);
|
STRDUP(newconflict->package2, conflict->package2, goto error);
|
||||||
newconflict->reason = conflict->reason;
|
newconflict->reason = conflict->reason;
|
||||||
|
|
||||||
return newconflict;
|
return newconflict;
|
||||||
|
|
||||||
|
error:
|
||||||
|
alpm_conflict_free(newconflict);
|
||||||
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Add table
Reference in a new issue