[pacman-dev] [PATCH 3/3] _alpm_splitdep: use malloc instead of calloc

[Dan McGee]

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 <dan at archlinux.org>
---
 lib/libalpm/deps.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c
index c99701e..6040158 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 */
-- 
1.7.6.4