Commit 382148d

authored

Fix UBSAN warning about applying zero offset to null pointer (#10700)

vpath may be NULL here so check for it before trying to add 0 (the length of the vpath) to it.

1 parent 375e740 commit 382148dCopy full SHA for 382148d

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1785,8 +1785,10 @@ static int php_cli_server_client_read_request_on_message_complete(php_http_parse`
`1785`	`1785`	`php_cli_server_client *client = parser->data;`
`1786`	`1786`	`client->request.protocol_version = parser->http_major * 100 + parser->http_minor;`
`1787`	`1787`	`php_cli_server_request_translate_vpath(&client->request, client->server->document_root, client->server->document_root_len);`
`1788`		`- {`
`1789`		`- const char vpath = client->request.vpath, end = vpath + client->request.vpath_len, *p = end;`
	`1788`	`+ if (client->request.vpath) {`
	`1789`	`+ const char *vpath = client->request.vpath;`
	`1790`	`+ const char *end = vpath + client->request.vpath_len;`
	`1791`	`+ const char *p = end;`
`1790`	`1792`	`client->request.ext = end;`
`1791`	`1793`	`client->request.ext_len = 0;`
`1792`	`1794`	`while (p > vpath) {`

Comments

(0)