Commit 4d224196 authored by Jean-Christophe DUBOIS's avatar Jean-Christophe DUBOIS Committed by Anthony Liguori
Browse files

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: default avatarJean-Christophe Dubois <jcd@tribudubois.net>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent d6fd1e66

vl.c

+2 −9
Original line number Diff line number Diff line
@@ -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