]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 25 Jun 2019 12:30:24 +0000 (14:30 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 25 Jun 2019 12:30:24 +0000 (14:30 +0200)
1  2 
Zend/zend_list.c
ext/ffi/ffi.c
ext/intl/converter/converter.c
ext/phar/phar.c
sapi/phpdbg/phpdbg_prompt.c

index 10293753bde1ea518e0a2b3b0c1e3774834b405e,21d013a5895a15deae3e924a26673251f9f3b947..2288cf6913c7f74c94d04c838b7a7fb195da708d
@@@ -206,10 -206,9 +206,10 @@@ void plist_entry_destructor(zval *zv
        free(res);
  }
  
- int zend_init_rsrc_list(void)
ZEND_API int zend_init_rsrc_list(void)
  {
        zend_hash_init(&EG(regular_list), 8, NULL, list_entry_destructor, 0);
 +      EG(regular_list).nNextFreeElement = 0;
        return SUCCESS;
  }
  
diff --cc ext/ffi/ffi.c
Simple merge
Simple merge
diff --cc ext/phar/phar.c
Simple merge
Simple merge