Skip to content

Commit ce5d722

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Let's make this safer from maliciously crafted filename
2 parents 5aa12d2 + 2958cdc commit ce5d722

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ext/opcache/ZendAccelerator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3278,7 +3278,7 @@ static size_t preload_try_strip_filename(zend_string *filename) {
32783278
if (ZSTR_LEN(filename) > sizeof(" eval()'d code")
32793279
&& *(ZSTR_VAL(filename) + ZSTR_LEN(filename) - sizeof(" eval()'d code")) == ':') {
32803280
const char *cfilename = ZSTR_VAL(filename);
3281-
size_t cfilenamelen = ZSTR_LEN(filename) - sizeof(" eval()'d code") - 2 /* :*/;
3281+
size_t cfilenamelen = ZSTR_LEN(filename) - sizeof(" eval()'d code") - 1 /*:*/;
32823282
while (cfilenamelen && cfilename[--cfilenamelen] != '(');
32833283
return cfilenamelen;
32843284
}

0 commit comments

Comments
 (0)