emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

httpd: fix bug where we did chdir("") if CGI path had only one "/".

Browse Source 
httpd: fix bug 2004: wrong argv when interpreter is invoked

+8 bytes growth
This commit is contained in:
Denis Vlasenko
2008-02-11 16:26:22 +00:00
parent f536b99d26
commit fc21305892
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
networking/httpd.c
View File

@@ -1417,36 +1417,38 @@ static void send_cgi_and_exit(
* If CGI really wants that, it can always do dup itself. */ * If CGI really wants that, it can always do dup itself. */
/* dup2(1, 2); */ /* dup2(1, 2); */
/* script must have absolute path */
script = strrchr(fullpath, '/'); script = strrchr(fullpath, '/');
//fullpath is a result of concat_path_file and always has '/' //fullpath is a result of concat_path_file and always has '/'
//if (!script) //if (!script)
// goto error_execing_cgi; // goto error_execing_cgi;
*script = '\0'; *script = '\0';
/* chdiring to script's dir */ /* chdiring to script's dir */
if (chdir(fullpath) == 0) { if (chdir(script == fullpath ? "/" : fullpath) == 0) {
char *argv[2]; char *argv[3];
*script++ = '/'; /* repair fullpath */
/* set argv[0] to name without path */
argv[0] = script;
argv[1] = NULL;
#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR #if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
char *interpr = NULL; {
char *suffix = strrchr(purl, '.'); char *suffix = strrchr(script, '.');
if (suffix) { if (suffix) {
Htaccess *cur; Htaccess *cur;
for (cur = script_i; cur; cur = cur->next) { for (cur = script_i; cur; cur = cur->next) {
if (strcmp(cur->before_colon + 1, suffix) == 0) { if (strcmp(cur->before_colon + 1, suffix) == 0) {
interpr = cur->after_colon; /* found interpreter name */
fullpath = cur->after_colon;
argv[0] = cur->after_colon;
argv[1] = script;
argv[2] = NULL;
break; break;
} }
} }
} }
#endif }
*script = '/';
/* set argv[0] to name without path */
argv[0] = script + 1;
argv[1] = NULL;
#if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
if (interpr)
fullpath = interpr;
#endif #endif
execv(fullpath, argv); execv(fullpath, argv);
if (verbose) if (verbose)