Kaydet (Commit) 6e890b86 authored tarafından Guido van Rossum's avatar Guido van Rossum

Save static pointer to malloc'ed buffer

üst a4403103
......@@ -149,27 +149,27 @@ extern char *getenv();
char *
getpythonpath()
{
#ifdef macintosh
return PYTHONPATH;
#else /* !macintosh */
char *path = getenv("PYTHONPATH");
char *defpath = PYTHONPATH;
char *buf;
static char *buf = NULL;
char *p;
int n;
if (path == 0 || *path == '\0')
return defpath;
if (path == NULL)
path = "";
n = strlen(path) + strlen(defpath) + 2;
if (buf != NULL) {
free(buf);
buf = NULL;
}
buf = malloc(n);
if (buf == NULL)
return path; /* XXX too bad -- but not likely */
fatal("not enough memory to copy module search path");
strcpy(buf, path);
p = buf + strlen(buf);
*p++ = DELIM;
strcpy(p, defpath);
return buf;
#endif /* !macintosh */
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment