From 4d224196614a005b519682b3eaff312ec71b5b97 Mon Sep 17 00:00:00 2001 From: Jean-Christophe DUBOIS Date: Wed, 2 Sep 2009 23:59:02 +0200 Subject: [PATCH] fix PATH_MAX conditional compilation PATH_MAX is used elsewhere in the qemu source tree without protection. In addtion the actual code would not compile if PATH_MAX is not defined Last the free() call is wrong as p is not malloc()ed. Signed-off-by: Jean-Christophe Dubois Signed-off-by: Anthony Liguori --- vl.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/vl.c b/vl.c index 215132a552..6d535b91e8 100644 --- a/vl.c +++ b/vl.c @@ -4625,9 +4625,7 @@ static char *find_datadir(const char *argv0) char *dir; char *p = NULL; char *res; -#ifdef PATH_MAX char buf[PATH_MAX]; -#endif size_t max_len; #if defined(__linux__) @@ -4652,10 +4650,7 @@ static char *find_datadir(const char *argv0) /* If we don't have any way of figuring out the actual executable location then try argv[0]. */ if (!p) { -#ifdef PATH_MAX - p = buf; -#endif - p = realpath(argv0, p); + p = realpath(argv0, buf); if (!p) { return NULL; } @@ -4674,9 +4669,7 @@ static char *find_datadir(const char *argv0) res = NULL; } } -#ifndef PATH_MAX - free(p); -#endif + return res; } #undef SHARE_SUFFIX