diff options
| author | Allan McRae <allan@archlinux.org> | 2014-12-24 02:55:49 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2014-12-27 08:08:32 +0100 |
| commit | 60d958c78bf5c6fca761492b4849dd36f098eb41 (patch) | |
| tree | d0d09052ae409773a1a4a05d4b50ea60ee74bb49 | |
| parent | be4198b34e01242e481664776c51936a150c1ff8 (diff) | |
| download | pacman-60d958c78bf5c6fca761492b4849dd36f098eb41.tar.gz pacman-60d958c78bf5c6fca761492b4849dd36f098eb41.tar.xz | |
Initialize memory to prevent issues when freeing on error
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | lib/libalpm/conflict.c | 4 | ||||
| -rw-r--r-- | lib/libalpm/deps.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 40cbb953..c886f785 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -48,7 +48,7 @@ static alpm_conflict_t *conflict_new(alpm_pkg_t *pkg1, alpm_pkg_t *pkg2, { alpm_conflict_t *conflict; - MALLOC(conflict, sizeof(alpm_conflict_t), return NULL); + CALLOC(conflict, 1, sizeof(alpm_conflict_t), return NULL); conflict->package1_hash = pkg1->name_hash; conflict->package2_hash = pkg2->name_hash; @@ -273,7 +273,7 @@ static alpm_list_t *add_fileconflict(alpm_handle_t *handle, alpm_pkg_t *pkg1, alpm_pkg_t *pkg2) { alpm_fileconflict_t *conflict; - MALLOC(conflict, sizeof(alpm_fileconflict_t), goto error); + CALLOC(conflict, 1, sizeof(alpm_fileconflict_t), goto error); STRDUP(conflict->target, pkg1->name, goto error); STRDUP(conflict->file, filestr, goto error); diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 2a21443e..d4fbf950 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -48,7 +48,7 @@ static alpm_depmissing_t *depmiss_new(const char *target, alpm_depend_t *dep, { alpm_depmissing_t *miss; - MALLOC(miss, sizeof(alpm_depmissing_t), return NULL); + CALLOC(miss, 1, sizeof(alpm_depmissing_t), return NULL); STRDUP(miss->target, target, goto error); miss->depend = _alpm_dep_dup(dep); @@ -469,7 +469,7 @@ alpm_depend_t SYMEXPORT *alpm_dep_from_string(const char *depstring) return NULL; } - MALLOC(depend, sizeof(alpm_depend_t), return NULL); + CALLOC(depend, 1, sizeof(alpm_depend_t), return NULL); /* Note the extra space in ": " to avoid matching the epoch */ if((desc = strstr(depstring, ": ")) != NULL) { |