summaryrefslogtreecommitdiffstats
path: root/src/pacman/query.c
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-05-20 00:17:32 +0200
committerDan McGee <dan@archlinux.org>2011-05-20 00:17:32 +0200
commit11fb9c767450dc193bbeef755c228aa620df75d9 (patch)
tree9f47a77d27b39ee7ddef40edba7bed3016d3ba08 /src/pacman/query.c
parent70cf4546d6d35ef9ef2751f37853cde679c88aa7 (diff)
parentf2c4e7e55220addef0581d1c38cc7363b5a0884c (diff)
downloadpacman-11fb9c767450dc193bbeef755c228aa620df75d9.tar.gz
pacman-11fb9c767450dc193bbeef755c228aa620df75d9.tar.xz
Merge branch 'maint'
Conflicts: lib/libalpm/trans.c src/pacman/query.c
Diffstat (limited to 'src/pacman/query.c')
-rw-r--r--src/pacman/query.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/pacman/query.c b/src/pacman/query.c
index 5ca52c38..d1105b4a 100644
--- a/src/pacman/query.c
+++ b/src/pacman/query.c
@@ -77,6 +77,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) {