php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-27 10:16:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4'

Browse Source
This commit is contained in:
Nikita Popov
2019-04-15 11:42:55 +02:00
parent a3dc083c81 433d68fce1
commit dc42e403a2
10 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Zend/zend_vm_def.h
+2 -2
View File
@@ -7992,7 +7992,7 @@ ZEND_VM_HANDLER(157, ZEND_FETCH_CLASS_NAME, UNUSED|CLASS_FETCH, ANY)
ZEND_VM_HANDLER(158, ZEND_CALL_TRAMPOLINE, ANY, ANY)
{
zend_array *args;
zend_array *args = NULL;
zend_function *fbc = EX(func);
zval *ret = EX(return_value);
uint32_t call_info = EX_CALL_INFO() & (ZEND_CALL_NESTED | ZEND_CALL_TOP | ZEND_CALL_RELEASE_THIS);
@@ -8023,7 +8023,7 @@ ZEND_VM_HANDLER(158, ZEND_CALL_TRAMPOLINE, ANY, ANY)
ZEND_CALL_NUM_ARGS(call) = 2;
ZVAL_STR(ZEND_CALL_ARG(call, 1), fbc->common.function_name);
if (num_args) {
if (args) {
ZVAL_ARR(ZEND_CALL_ARG(call, 2), args);
} else {
ZVAL_EMPTY_ARRAY(ZEND_CALL_ARG(call, 2));
Zend/zend_vm_execute.h
+2 -2
View File
@@ -2104,7 +2104,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSERT_CHECK_SPEC_HANDLER(ZEND
static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CALL_TRAMPOLINE_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
zend_array *args;
zend_array *args = NULL;
zend_function *fbc = EX(func);
zval *ret = EX(return_value);
uint32_t call_info = EX_CALL_INFO() & (ZEND_CALL_NESTED | ZEND_CALL_TOP | ZEND_CALL_RELEASE_THIS);
@@ -2135,7 +2135,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CALL_TRAMPOLINE_SPEC_HANDLER(Z
ZEND_CALL_NUM_ARGS(call) = 2;
ZVAL_STR(ZEND_CALL_ARG(call, 1), fbc->common.function_name);
if (num_args) {
if (args) {
ZVAL_ARR(ZEND_CALL_ARG(call, 2), args);
} else {
ZVAL_EMPTY_ARRAY(ZEND_CALL_ARG(call, 2));
ext/fileinfo/libmagic.patch
+2 -2
View File
@@ -1,6 +1,6 @@
diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
--- libmagic.orig/apprentice.c 2018-03-11 01:46:42.000000000 +0100
+++ libmagic/apprentice.c 2019-04-12 10:04:15.721646341 +0200
+++ libmagic/apprentice.c 2019-04-15 10:57:47.115181746 +0200
@@ -2,7 +2,7 @@
* Copyright (c) Ian F. Darwin 1986-1995.
* Software written by Ian F. Darwin and others;
@@ -945,7 +945,7 @@ diff -u libmagic.orig/apprentice.c libmagic/apprentice.c
- int fd;
- struct stat st;
+ uint32_t *ptr;
+ uint32_t version, entries, nentries;
+ uint32_t version, entries = 0, nentries;
+ int needsbyteswap;
char *dbname = NULL;
struct magic_map *map;
ext/fileinfo/libmagic/apprentice.c
+1 -1
View File
@@ -2954,7 +2954,7 @@ private struct magic_map *
apprentice_map(struct magic_set *ms, const char *fn)
{
uint32_t *ptr;
uint32_t version, entries, nentries;
uint32_t version, entries = 0, nentries;
int needsbyteswap;
char *dbname = NULL;
struct magic_map *map;
ext/pdo/pdo_stmt.c
+1 -1
View File
@@ -820,7 +820,7 @@ static int do_fetch(pdo_stmt_t *stmt, int do_bind, zval *return_value, enum pdo_
{
int flags, idx, old_arg_count = 0;
zend_class_entry *ce = NULL, *old_ce = NULL;
zval grp_val, *pgrp, retval, old_ctor_args;
zval grp_val, *pgrp, retval, old_ctor_args = {0};
int colno;
if (how == PDO_FETCH_USE_DEFAULT) {
ext/simplexml/simplexml.c
+4 -2
View File
@@ -1024,6 +1024,7 @@ static int sxe_prop_is_empty(zend_object *object) /* {{{ */
zval iter_data;
int test;
int is_empty;
int use_iter = 0;
sxe = php_sxe_fetch_object(object);
@@ -1060,6 +1061,7 @@ static int sxe_prop_is_empty(zend_object *object) /* {{{ */
ZVAL_COPY_VALUE(&iter_data, &sxe->iter.data);
ZVAL_UNDEF(&sxe->iter.data);
node = php_sxe_reset_iterator(sxe, 0);
use_iter = 1;
}
}
@@ -1088,7 +1090,7 @@ static int sxe_prop_is_empty(zend_object *object) /* {{{ */
is_empty = 0;
break;
next_iter:
if (!Z_ISUNDEF(iter_data)) {
if (use_iter) {
node = php_sxe_iterator_fetch(sxe, node->next, 0);
} else {
node = node->next;
@@ -1096,7 +1098,7 @@ next_iter:
}
}
if (!Z_ISUNDEF(iter_data)) {
if (use_iter) {
if (!Z_ISUNDEF(sxe->iter.data)) {
zval_ptr_dtor(&sxe->iter.data);
}
ext/sockets/conversions.c
+3
View File
@@ -701,6 +701,9 @@ static void from_zval_write_sockaddr_aux(const zval *container,
zval *elem;
int fill_sockaddr;
*sockaddr_ptr = NULL;
*sockaddr_len = 0;
if (Z_TYPE_P(container) != IS_ARRAY) {
do_from_zval_err(ctx, "%s", "expected an array here");
return;
ext/standard/php_fopen_wrapper.c
+1 -1
View File
@@ -181,7 +181,7 @@ php_stream * php_stream_url_wrap_php(php_stream_wrapper *wrapper, const char *pa
int fd = -1;
int mode_rw = 0;
php_stream * stream = NULL;
char *p, *token, *pathdup;
char *p, *token = NULL, *pathdup;
zend_long max_memory;
FILE *file = NULL;
#ifdef PHP_WIN32
ext/standard/tests/file/stat_variation3-win32.phpt
+1 -1
View File
@@ -54,7 +54,7 @@ $new_stat1 = stat($dirname);
// compare self stats
var_dump( compare_self_stat($new_stat1) );
// compare the stats
var_dump(compare_stats($new_stat, $new_stat1, $all_stat_keys, "=="));
var_dump(compare_stats($new_stat, $new_stat1, $affected_members, "<"));
clearstatcache();
echo "\n*** Done ***";
sapi/cli/php_cli_server.c
+1
View File
@@ -1448,6 +1448,7 @@ static void normalize_vpath(char **retval, size_t *retval_len, const char *vpath
char *p;
*retval = NULL;
*retval_len = 0;
decoded_vpath = pestrndup(vpath, vpath_len, persistent);
if (!decoded_vpath) {