diff options
| -rw-r--r-- | ext/opcache/Optimizer/block_pass.c | 4 | ||||
| -rw-r--r-- | ext/pdo/pdo_sql_parser.re | 4 | ||||
| -rw-r--r-- | ext/sockets/conversions.c | 3 | ||||
| -rw-r--r-- | ext/sockets/sockets.c | 6 | ||||
| -rw-r--r-- | ext/sockets/tests/socket_import_stream-2.phpt | 2 | ||||
| -rw-r--r-- | ext/sockets/tests/socket_import_stream-4.phpt | 8 | ||||
| -rw-r--r-- | ext/sockets/tests/socket_set_block-retval.phpt | 2 | ||||
| -rw-r--r-- | ext/sockets/tests/socket_set_nonblock-retval.phpt | 2 |
8 files changed, 19 insertions, 12 deletions
diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c index 3316e52337..20b7a1ae31 100644 --- a/ext/opcache/Optimizer/block_pass.c +++ b/ext/opcache/Optimizer/block_pass.c @@ -751,7 +751,7 @@ static void zend_optimize_block(zend_code_block *block, zend_op_array *op_array, (flen == sizeof("is_callable")-1 && zend_binary_strcasecmp(fname, flen, "is_callable", sizeof("is_callable")-1) == 0) ) { zend_function *function; - if(zend_hash_find(EG(function_table), Z_STRVAL_P(arg), Z_STRLEN_P(arg)+1, (void **)&function) != NULL) { + if((function = zend_hash_find_ptr(EG(function_table), Z_STR_P(arg))) != NULL) { literal_dtor(arg); MAKE_NOP(sv); MAKE_NOP(fcall); @@ -769,7 +769,7 @@ static void zend_optimize_block(zend_code_block *block, zend_op_array *op_array, ZEND_OP1_TYPE(opline) = IS_CONST; } } else if(flen == sizeof("extension_loaded")-1 && zend_binary_strcasecmp(fname, flen, "extension_loaded", sizeof("extension_loaded")-1) == 0) { - if(zend_hash_exists(&module_registry, Z_STRVAL_P(arg), Z_STRLEN_P(arg)+1)) { + if(zend_hash_exists(&module_registry, Z_STR_P(arg))) { literal_dtor(arg); MAKE_NOP(sv); MAKE_NOP(fcall); diff --git a/ext/pdo/pdo_sql_parser.re b/ext/pdo/pdo_sql_parser.re index a1742e397a..f13fb89176 100644 --- a/ext/pdo/pdo_sql_parser.re +++ b/ext/pdo/pdo_sql_parser.re @@ -456,9 +456,9 @@ int old_pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len, char } /* lookup bind first via hash and then index */ /* stupid keys need to be null-terminated, even though we know their length */ - if((NULL != zend_hash_find(params, s.tok, s.cur-s.tok,(void **)¶m)) + if((NULL != (param = zend_hash_str_find_ptr(params, s.tok, s.cur-s.tok)) || - (NULL != zend_hash_index_find(params, bindno, (void **)¶m))) + NULL != (params = zend_hash_index_find_ptr(params, bindno))) { char *quotedstr; int quotedstrlen; diff --git a/ext/sockets/conversions.c b/ext/sockets/conversions.c index ff96e95c4c..05b3f9d51a 100644 --- a/ext/sockets/conversions.c +++ b/ext/sockets/conversions.c @@ -308,6 +308,7 @@ static long from_zval_integer_common(const zval *arr_value, ser_context *ctx) long ret = 0; zval lzval; + ZVAL_NULL(&lzval); if (Z_TYPE_P(arr_value) != IS_LONG) { ZVAL_COPY(&lzval, arr_value); arr_value = &lzval; @@ -926,7 +927,7 @@ static void from_zval_write_control_array(const zval *arr, char *msghdr_c, ser_c char buf[sizeof("element #4294967295")]; char *bufp = buf; zval *elem; - uint32_t i; + uint32_t i = 0; int num_elems; void *control_buf; zend_llist_element *alloc; diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 1237b6c39e..b858a4733e 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -1192,6 +1192,11 @@ PHP_FUNCTION(socket_getsockname) RETURN_FALSE; } + ZVAL_DEREF(addr); + if (port != NULL) { + ZVAL_DEREF(port); + } + switch (sa->sa_family) { #if HAVE_IPV6 case AF_INET6: @@ -2099,6 +2104,7 @@ PHP_FUNCTION(socket_create_pair) php_sock[0] = php_create_socket(); php_sock[1] = php_create_socket(); + ZVAL_DEREF(fds_array_zval); if (domain != AF_INET #if HAVE_IPV6 && domain != AF_INET6 diff --git a/ext/sockets/tests/socket_import_stream-2.phpt b/ext/sockets/tests/socket_import_stream-2.phpt index 085f0e3834..4f06bbd719 100644 --- a/ext/sockets/tests/socket_import_stream-2.phpt +++ b/ext/sockets/tests/socket_import_stream-2.phpt @@ -43,7 +43,7 @@ bool(false) resource(%d) of type (stream) bool(true) -Warning: socket_import_stream(): %d is not a valid stream resource in %s on line %d +Warning: socket_import_stream(): supplied resource is not a valid stream resource in %s on line %d bool(false) Done. diff --git a/ext/sockets/tests/socket_import_stream-4.phpt b/ext/sockets/tests/socket_import_stream-4.phpt index 8095d8dac7..4b645014d7 100644 --- a/ext/sockets/tests/socket_import_stream-4.phpt +++ b/ext/sockets/tests/socket_import_stream-4.phpt @@ -76,7 +76,7 @@ stream_set_blocking 1 close stream stream_set_blocking -Warning: stream_set_blocking(): %d is not a valid stream resource in %s on line %d +Warning: stream_set_blocking(): supplied resource is not a valid stream resource in %s on line %d socket_set_block Warning: socket_set_block(): unable to set blocking mode [%d]: %s in %s on line %d @@ -88,13 +88,13 @@ Warning: socket_get_option(): unable to retrieve socket option [%d]: %s in %s on close socket stream_set_blocking -Warning: stream_set_blocking(): %d is not a valid stream resource in %s on line %d +Warning: stream_set_blocking(): supplied resource is not a valid stream resource in %s on line %d socket_set_block -Warning: socket_set_block(): %d is not a valid Socket resource in %s on line %d +Warning: socket_set_block(): supplied resource is not a valid Socket resource in %s on line %d socket_get_option -Warning: socket_get_option(): %d is not a valid Socket resource in %s on line %d +Warning: socket_get_option(): supplied resource is not a valid Socket resource in %s on line %d Done. diff --git a/ext/sockets/tests/socket_set_block-retval.phpt b/ext/sockets/tests/socket_set_block-retval.phpt index 2aa4b0e5c4..88e0029989 100644 --- a/ext/sockets/tests/socket_set_block-retval.phpt +++ b/ext/sockets/tests/socket_set_block-retval.phpt @@ -21,7 +21,7 @@ var_dump(socket_set_block($socket2)); --EXPECTF-- bool(true) -Warning: socket_set_block(): %d is not a valid Socket resource in %s on line %d +Warning: socket_set_block(): supplied resource is not a valid Socket resource in %s on line %d bool(false) --CREDITS-- Robin Mehner, robin@coding-robin.de diff --git a/ext/sockets/tests/socket_set_nonblock-retval.phpt b/ext/sockets/tests/socket_set_nonblock-retval.phpt index b90861859a..c9bb1150ab 100644 --- a/ext/sockets/tests/socket_set_nonblock-retval.phpt +++ b/ext/sockets/tests/socket_set_nonblock-retval.phpt @@ -21,7 +21,7 @@ var_dump(socket_set_nonblock($socket2)); --EXPECTF-- bool(true) -Warning: socket_set_nonblock(): %d is not a valid Socket resource in %s on line %d +Warning: socket_set_nonblock(): supplied resource is not a valid Socket resource in %s on line %d bool(false) --CREDITS-- Robin Mehner, robin@coding-robin.de |