From 6f8647f5c80ab901755702b20076e0c51a24674e Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 17 Feb 2009 23:28:40 +0100 Subject: [PATCH] xbps_get_pkg_{name,version}: check for strrchr() returning NULL. --HG-- extra : convert_revision : 4d63c1834f7b3c3b1a0395a7434095e9fc341885 --- lib/util.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/util.c b/lib/util.c index 30349775826..b6ac5c775f5 100644 --- a/lib/util.c +++ b/lib/util.c @@ -117,7 +117,9 @@ xbps_get_pkg_version(const char *pkg) /* Get the required version */ tmp = strrchr(pkg, '-'); - assert(tmp != NULL); + if (tmp == NULL) + return NULL; + return tmp + 1; /* skip first '-' */ } @@ -132,7 +134,9 @@ xbps_get_pkg_name(const char *pkg) /* Get package name */ tmp = strrchr(pkg, '-'); - assert(tmp != NULL); + if (tmp == NULL) + return NULL; + len = strlen(pkg) - strlen(tmp) + 1; pkgname = malloc(len);