From 8f2b6a67d98c7a974397d78645d1bcb06304f253 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 15 Apr 2016 15:13:07 +0000 Subject: Fix parsing of PATH_INFO if both a section directory and an architecture subdirectory are specified. Issue reported by tb@. --- cgi.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/cgi.c b/cgi.c index ad73a5b9..ee79431e 100644 --- a/cgi.c +++ b/cgi.c @@ -1085,7 +1085,7 @@ main(void) static void path_parse(struct req *req, const char *path) { - int dir_done; + char *dir; req->isquery = 0; req->q.equal = 1; @@ -1115,23 +1115,19 @@ path_parse(struct req *req, const char *path) req->q.query = mandoc_strdup(req->q.query); /* Optional architecture. */ - dir_done = 0; - for (;;) { - if ((req->q.arch = strrchr(req->q.manpath, '/')) == NULL) - break; - *req->q.arch++ = '\0'; - if (dir_done || strncmp(req->q.arch, "man", 3)) { - req->q.arch = mandoc_strdup(req->q.arch); - break; - } + dir = strrchr(req->q.manpath, '/'); + if (dir != NULL && strncmp(dir + 1, "man", 3) != 0) { + *dir++ = '\0'; + req->q.arch = mandoc_strdup(dir); + dir = strrchr(req->q.manpath, '/'); + } else + req->q.arch = NULL; - /* Optional directory name. */ - req->q.arch += 3; - if (*req->q.arch != '\0') { - free(req->q.sec); - req->q.sec = mandoc_strdup(req->q.arch); - } - dir_done = 1; + /* Optional directory name. */ + if (dir != NULL && strncmp(dir + 1, "man", 3) == 0) { + *dir++ = '\0'; + free(req->q.sec); + req->q.sec = mandoc_strdup(dir + 3); } } -- cgit