From 69962184bb3cc313f744de6553ef31b4eb256a01 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 27 Sep 2011 17:47:40 -0500 Subject: _alpm_splitdep: use malloc instead of calloc There was only one simple to handle case where we left a field uninitialized; set it to NULL and use malloc() instead. Signed-off-by: Dan McGee --- lib/libalpm/deps.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index c99701e9..60401583 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -409,14 +409,14 @@ int _alpm_depcmp(alpm_pkg_t *pkg, alpm_depend_t *dep) alpm_depend_t *_alpm_splitdep(const char *depstring) { alpm_depend_t *depend; - const char *ptr, *version = NULL; + const char *ptr, *version; size_t deplen; if(depstring == NULL) { return NULL; } - CALLOC(depend, 1, sizeof(alpm_depend_t), return NULL); + MALLOC(depend, sizeof(alpm_depend_t), return NULL); deplen = strlen(depstring); /* Find a version comparator if one exists. If it does, set the type and @@ -442,8 +442,10 @@ alpm_depend_t *_alpm_splitdep(const char *depstring) depend->mod = ALPM_DEP_MOD_EQ; version = ptr + 1; } else { - /* no version specified, leave version and ptr NULL */ + /* no version specified, leave ptr NULL and set version to NULL */ depend->mod = ALPM_DEP_MOD_ANY; + depend->version = NULL; + version = NULL; } /* copy the right parts to the right places */ -- cgit v1.2.3-70-g09d2