From f2c4e7e55220addef0581d1c38cc7363b5a0884c Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 19 May 2011 16:59:53 -0500 Subject: Coding style cleanups; add a null check Signed-off-by: Dan McGee --- src/pacman/query.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/pacman/query.c') diff --git a/src/pacman/query.c b/src/pacman/query.c index 5d036881..6c63774f 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -60,16 +60,16 @@ static int search_path(char **filename, struct stat *bufptr) char *envpath, *envpathsplit, *path, *fullname; size_t flen; - if ((envpath = getenv("PATH")) == NULL) { + if((envpath = getenv("PATH")) == NULL) { return(-1); } - if ((envpath = envpathsplit = strdup(envpath)) == NULL) { + if((envpath = envpathsplit = strdup(envpath)) == NULL) { return(-1); } flen = strlen(*filename); - while ((path = strsep(&envpathsplit, ":")) != NULL) { + while((path = strsep(&envpathsplit, ":")) != NULL) { size_t plen = strlen(path); /* strip the trailing slash if one exists */ @@ -78,6 +78,10 @@ static int search_path(char **filename, struct stat *bufptr) } fullname = malloc(plen + flen + 2); + if(!fullname) { + free(envpath); + return(-1); + } sprintf(fullname, "%s/%s", path, *filename); if(lstat(fullname, bufptr) == 0) { @@ -94,7 +98,7 @@ static int search_path(char **filename, struct stat *bufptr) static void print_query_fileowner(const char *filename, pmpkg_t *info) { - if (!config->quiet) { + if(!config->quiet) { printf(_("%s is owned by %s %s\n"), filename, alpm_pkg_get_name(info), alpm_pkg_get_version(info)); } else { -- cgit v1.2.3-24-g4f1b