Merge branch 'PHP-8.1'

* PHP-8.1:
  Fix bug #81472: Support large device major/minor number
This commit is contained in:
Nikita Popov 2021-09-24 09:58:29 +02:00
commit 1ea58832e2

View file

@ -3006,11 +3006,11 @@ static void accel_move_code_to_huge_pages(void)
f = fopen("/proc/self/maps", "r");
if (f) {
long unsigned int start, end, offset, inode;
char perm[5], dev[6], name[MAXPATHLEN];
char perm[5], dev[10], name[MAXPATHLEN];
int ret;
while (1) {
ret = fscanf(f, "%lx-%lx %4s %lx %5s %ld %s\n", &start, &end, perm, &offset, dev, &inode, name);
ret = fscanf(f, "%lx-%lx %4s %lx %9s %ld %s\n", &start, &end, perm, &offset, dev, &inode, name);
if (ret == 7) {
if (perm[0] == 'r' && perm[1] == '-' && perm[2] == 'x' && name[0] == '/') {
long unsigned int seg_start = ZEND_MM_ALIGNED_SIZE_EX(start, huge_page_size);