Fix out-of-bounds memory accesses with virtual_root=""
The CGit configuration variable virtual_root is normalized so that it does not have a trailing '/' character, but it is allowed to be empty (the empty string and NULL have different meanings here) and there is code that is insufficiently cautious when checking if it ends in a '/': if (virtual_root[strlen(virtual_root) - 1] != '/') Clearly this check is redundant, but rather than simply removing it we get a slight efficiency improvement by switching the normalization so that the virtual_root variable always ends in '/'. Do this with a new "ensure_end" helper. Signed-off-by: John Keeping <john@keeping.me.uk>
这个提交包含在:
11
cgit.c
11
cgit.c
@ -155,9 +155,7 @@ static void config_cb(const char *name, const char *value)
|
||||
else if (!strcmp(name, "strict-export"))
|
||||
ctx.cfg.strict_export = xstrdup(value);
|
||||
else if (!strcmp(name, "virtual-root")) {
|
||||
ctx.cfg.virtual_root = trim_end(value, '/');
|
||||
if (!ctx.cfg.virtual_root && (!strcmp(value, "/")))
|
||||
ctx.cfg.virtual_root = "";
|
||||
ctx.cfg.virtual_root = ensure_end(value, '/');
|
||||
} else if (!strcmp(name, "nocache"))
|
||||
ctx.cfg.nocache = atoi(value);
|
||||
else if (!strcmp(name, "noplainemail"))
|
||||
@ -833,11 +831,8 @@ int main(int argc, const char **argv)
|
||||
* that virtual-root equals SCRIPT_NAME, minus any possibly
|
||||
* trailing slashes.
|
||||
*/
|
||||
if (!ctx.cfg.virtual_root && ctx.cfg.script_name) {
|
||||
ctx.cfg.virtual_root = trim_end(ctx.cfg.script_name, '/');
|
||||
if (!ctx.cfg.virtual_root)
|
||||
ctx.cfg.virtual_root = "";
|
||||
}
|
||||
if (!ctx.cfg.virtual_root && ctx.cfg.script_name)
|
||||
ctx.cfg.virtual_root = ensure_end(ctx.cfg.script_name, '/');
|
||||
|
||||
/* If no url parameter is specified on the querystring, lets
|
||||
* use PATH_INFO as url. This allows cgit to work with virtual
|
||||
|
在新工单中引用
屏蔽一个用户