From 2d738c2c40cc8e87ff05aa5ad87055f8268ff288 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Tue, 1 May 2012 01:27:19 +0000 Subject: [PATCH] pkg: make PKG_CONFIG_PATH parsing more robust --- pkg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg.c b/pkg.c index 5cf5e97..fe73525 100644 --- a/pkg.c +++ b/pkg.c @@ -58,20 +58,24 @@ pkg_find(const char *name) int count = 0, pcount = 0; FILE *f; + bzero(path, BUFSIZ); + env_path = pkg_get_pkgconfig_path(); while (env_path[count] != '\0') { - if (env_path[count] != ':') + if (env_path[count] && env_path[count] != ':') { path[pcount] = env_path[count]; pcount++; } else { + path[pcount] = '\0'; snprintf(locbuf, sizeof locbuf, "%s/%s.pc", path, name); if (f = fopen(locbuf, "r")) return parse_file(locbuf, f); - path[0] = '\0'; + + bzero(path, BUFSIZ); pcount = 0; }