1
0
mirror of https://github.com/php/php-src.git synced 2026-04-29 03:03:26 +02:00

Merge branch 'PHP-7.4'

* PHP-7.4:
  Let's make this safer from maliciously crafted filename
This commit is contained in:
Xinchen Hui
2020-01-20 12:35:08 +08:00
+1 -1
View File
@@ -3278,7 +3278,7 @@ static size_t preload_try_strip_filename(zend_string *filename) {
if (ZSTR_LEN(filename) > sizeof(" eval()'d code")
&& *(ZSTR_VAL(filename) + ZSTR_LEN(filename) - sizeof(" eval()'d code")) == ':') {
const char *cfilename = ZSTR_VAL(filename);
size_t cfilenamelen = ZSTR_LEN(filename) - sizeof(" eval()'d code") - 2 /* :*/;
size_t cfilenamelen = ZSTR_LEN(filename) - sizeof(" eval()'d code") - 1 /*:*/;
while (cfilenamelen && cfilename[--cfilenamelen] != '(');
return cfilenamelen;
}