Commit 48a344a1994 for php
commit 48a344a1994e80d4e7249b9373837f4c7442a10f
Author: Gina Peter Banyard <girgias@php.net>
Date: Mon Nov 9 00:03:48 2026 +0000
tree: fix and use php_stream_from_res_no_verify()
diff --git a/ext/bz2/bz2.c b/ext/bz2/bz2.c
index dd1b87d2bf6..fd06cb230a7 100644
--- a/ext/bz2/bz2.c
+++ b/ext/bz2/bz2.c
@@ -386,7 +386,7 @@ PHP_FUNCTION(bzopen)
php_socket_t fd;
size_t stream_mode_len;
- php_stream_from_zval(stream, file);
+ php_stream_from_res(stream, Z_RES_P(file));
stream_mode_len = strlen(stream->mode);
char primary_stream_mode;
diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c
index 4bc76b44ea7..4ee4e3b6d9f 100644
--- a/ext/fileinfo/fileinfo.c
+++ b/ext/fileinfo/fileinfo.c
@@ -402,7 +402,7 @@ PHP_FUNCTION(mime_content_type)
break;
case IS_RESOURCE:
- php_stream_from_zval(stream, path_or_stream);
+ php_stream_from_res(stream, Z_RES_P(path_or_stream));
break;
default:
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 5f472f68c35..2456bbda6b5 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -4572,7 +4572,7 @@ static gdIOCtx *create_output_context(zval *to_zval, uint32_t arg_num) {
ZEND_ASSERT(arg_num > 0);
if (Z_TYPE_P(to_zval) == IS_RESOURCE) {
- php_stream_from_zval_no_verify(stream, to_zval);
+ php_stream_from_res_no_verify(stream, Z_RES_P(to_zval));
if (stream == NULL) {
return NULL;
}
diff --git a/ext/pdo/pdo_sql_parser.re b/ext/pdo/pdo_sql_parser.re
index d77425531cc..eae2f8b483e 100644
--- a/ext/pdo/pdo_sql_parser.re
+++ b/ext/pdo/pdo_sql_parser.re
@@ -239,7 +239,7 @@ safe:
if (param->param_type == PDO_PARAM_LOB && Z_TYPE_P(parameter) == IS_RESOURCE) {
php_stream *stm;
- php_stream_from_zval_no_verify(stm, parameter);
+ php_stream_from_res_no_verify(stm, Z_RES_P(parameter));
if (stm) {
zend_string *buf;
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 07dbe915b7b..97e7766a239 100644
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -540,7 +540,7 @@ static inline void fetch_value(pdo_stmt_t *stmt, zval *dest, int colno, enum pdo
} else if (Z_TYPE_P(dest) == IS_RESOURCE) {
/* Convert LOB stream to string */
php_stream *stream;
- php_stream_from_zval_no_verify(stream, dest);
+ php_stream_from_res_no_verify(stream, Z_RES_P(dest));
zend_string *str = php_stream_copy_to_mem(stream, PHP_STREAM_COPY_ALL, 0);
zval_ptr_dtor_nogc(dest);
if (str == NULL) {
diff --git a/ext/pdo_firebird/firebird_statement.c b/ext/pdo_firebird/firebird_statement.c
index 1d3edd20d9f..e5d3c9f95d5 100644
--- a/ext/pdo_firebird/firebird_statement.c
+++ b/ext/pdo_firebird/firebird_statement.c
@@ -705,7 +705,7 @@ static int pdo_firebird_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param
if (Z_TYPE_P(parameter) == IS_RESOURCE) {
php_stream *stm = NULL;
- php_stream_from_zval_no_verify(stm, parameter);
+ php_stream_from_res_no_verify(stm, Z_RES_P(parameter));
if (stm) {
zend_string *mem = php_stream_copy_to_mem(stm, PHP_STREAM_COPY_ALL, 0);
zval_ptr_dtor(parameter);
diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c
index e5a6c008ff0..77343145f02 100644
--- a/ext/pdo_mysql/mysql_statement.c
+++ b/ext/pdo_mysql/mysql_statement.c
@@ -441,7 +441,7 @@ static int pdo_mysql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_da
}
if (Z_TYPE_P(parameter) == IS_RESOURCE) {
php_stream *stm = NULL;
- php_stream_from_zval_no_verify(stm, parameter);
+ php_stream_from_res_no_verify(stm, Z_RES_P(parameter));
if (stm) {
zend_string *mem = php_stream_copy_to_mem(stm, PHP_STREAM_COPY_ALL, 0);
zval_ptr_dtor(parameter);
diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c
index e2c8a35944c..43aabecc7b5 100644
--- a/ext/pdo_pgsql/pgsql_statement.c
+++ b/ext/pdo_pgsql/pgsql_statement.c
@@ -558,7 +558,7 @@ static int pgsql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *
if (PDO_PARAM_TYPE(param->param_type) == PDO_PARAM_LOB &&
Z_TYPE_P(parameter) == IS_RESOURCE) {
php_stream *stm;
- php_stream_from_zval_no_verify(stm, parameter);
+ php_stream_from_res_no_verify(stm, Z_RES_P(parameter));
if (stm) {
if (php_stream_is(stm, &pdo_pgsql_lob_stream_ops)) {
struct pdo_pgsql_lob_self *self = (struct pdo_pgsql_lob_self*)stm->abstract;
diff --git a/ext/pdo_sqlite/sqlite_statement.c b/ext/pdo_sqlite/sqlite_statement.c
index 12d98000ae9..f8312bbf046 100644
--- a/ext/pdo_sqlite/sqlite_statement.c
+++ b/ext/pdo_sqlite/sqlite_statement.c
@@ -138,7 +138,7 @@ static int pdo_sqlite_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_d
}
if (Z_TYPE_P(parameter) == IS_RESOURCE) {
php_stream *stm = NULL;
- php_stream_from_zval_no_verify(stm, parameter);
+ php_stream_from_res_no_verify(stm, Z_RES_P(parameter));
if (stm) {
zend_string *mem = php_stream_copy_to_mem(stm, PHP_STREAM_COPY_ALL, 0);
zval_ptr_dtor(parameter);
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 5bf919c13bd..c9e5132ce9c 100644
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -1407,7 +1407,7 @@ static int phar_build(zend_object_iterator *iter, void *puser) /* {{{ */
case IS_STRING:
break;
case IS_RESOURCE:
- php_stream_from_zval_no_verify(fp, value);
+ php_stream_from_res_no_verify(fp, Z_RES_P(value));
if (!fp) {
zend_throw_exception_ex(spl_ce_BadMethodCallException, 0, "Iterator %pS returned an invalid stream handle", ce->name);
@@ -2849,7 +2849,7 @@ PHP_METHOD(Phar, setStub)
RETURN_THROWS();
}
- if ((php_stream_from_zval_no_verify(stream, zstub)) != NULL) {
+ if ((php_stream_from_res_no_verify(stream, Z_RES_P(zstub))) != NULL) {
if (phar_obj->archive->is_persistent && FAILURE == phar_copy_on_write(&(phar_obj->archive))) {
zend_throw_exception_ex(phar_ce_PharException, 0, "phar \"%pS\" is persistent, unable to copy on write", phar_obj->archive->fname);
RETURN_THROWS();
diff --git a/ext/posix/posix.c b/ext/posix/posix.c
index 3e7eff085c2..4b68500af0e 100644
--- a/ext/posix/posix.c
+++ b/ext/posix/posix.c
@@ -445,11 +445,11 @@ PHP_FUNCTION(posix_ctermid)
/* }}} */
/* Checks if the provides resource is a stream and if it provides a file descriptor */
-static zend_result php_posix_stream_get_fd(zval *zfp, zend_long *ret) /* {{{ */
+static zend_result php_posix_stream_get_fd(zend_resource *zfp, zend_long *ret) /* {{{ */
{
php_stream *stream;
- php_stream_from_zval_no_verify(stream, zfp);
+ php_stream_from_res_no_verify(stream, zfp);
if (stream == NULL) {
return FAILURE;
@@ -490,7 +490,7 @@ PHP_FUNCTION(posix_ttyname)
ZEND_PARSE_PARAMETERS_END();
if (Z_TYPE_P(z_fd) == IS_RESOURCE) {
- if (php_posix_stream_get_fd(z_fd, &fd) == FAILURE) {
+ if (php_posix_stream_get_fd(Z_RES_P(z_fd), &fd) == FAILURE) {
RETURN_FALSE;
}
} else {
@@ -552,7 +552,7 @@ PHP_FUNCTION(posix_isatty)
ZEND_PARSE_PARAMETERS_END();
if (Z_TYPE_P(z_fd) == IS_RESOURCE) {
- if (php_posix_stream_get_fd(z_fd, &fd) == FAILURE) {
+ if (php_posix_stream_get_fd(Z_RES_P(z_fd), &fd) == FAILURE) {
RETURN_FALSE;
}
} else {
@@ -1377,7 +1377,7 @@ PHP_FUNCTION(posix_fpathconf)
ZEND_PARSE_PARAMETERS_END();
if (Z_TYPE_P(z_fd) == IS_RESOURCE) {
- if (php_posix_stream_get_fd(z_fd, &fd) == FAILURE) {
+ if (php_posix_stream_get_fd(Z_RES_P(z_fd), &fd) == FAILURE) {
RETURN_FALSE;
}
} else {
diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c
index 13bbdae5dd8..521b75f287f 100644
--- a/ext/soap/php_http.c
+++ b/ext/soap/php_http.c
@@ -453,7 +453,7 @@ bool make_http_soap_request(
tmp = Z_CLIENT_HTTPSOCKET_P(this_ptr);
if (Z_TYPE_P(tmp) == IS_RESOURCE) {
- php_stream_from_zval_no_verify(stream,tmp);
+ php_stream_from_res_no_verify(stream, Z_RES_P(tmp));
tmp = Z_CLIENT_USE_PROXY_P(this_ptr);
if (Z_TYPE_P(tmp) == IS_LONG) {
use_proxy = Z_LVAL_P(tmp);
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 53b7e62a6e8..800c6be4a60 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -2667,7 +2667,7 @@ PHP_FUNCTION(socket_import_stream)
ZEND_PARSE_PARAMETERS_START(1, 1)
Z_PARAM_RESOURCE(zstream)
ZEND_PARSE_PARAMETERS_END();
- php_stream_from_zval(stream, zstream);
+ php_stream_from_res(stream, Z_RES_P(zstream));
if (php_stream_cast(stream, PHP_STREAM_AS_SOCKETD, (void**)&socket, 1) == FAILURE) {
/* error supposedly already shown */
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
index 13e4bbad135..4c899b3a3a0 100644
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@ -1651,7 +1651,7 @@ static int php_sqlite3_bind_params(php_sqlite3_stmt *stmt_obj) /* {{{ */
php_stream *stream = NULL;
zend_string *buffer = NULL;
if (Z_TYPE_P(parameter) == IS_RESOURCE) {
- php_stream_from_zval_no_verify(stream, parameter);
+ php_stream_from_res_no_verify(stream, Z_RES_P(parameter));
if (stream == NULL) {
php_sqlite3_error(stmt_obj->db_obj, 0, "Unable to read stream for parameter %ld", param->param_number);
return FAILURE;
diff --git a/ext/standard/file.c b/ext/standard/file.c
index 3f6deca5427..4a81926aba5 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -457,7 +457,7 @@ PHP_FUNCTION(file_put_contents)
ZEND_PARSE_PARAMETERS_END();
if (Z_TYPE_P(data) == IS_RESOURCE) {
- php_stream_from_zval(srcstream, data);
+ php_stream_from_res(srcstream, Z_RES_P(data));
}
php_stream_error_operation_begin();
diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index a8362ea4f87..dd468baa375 100644
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -1697,7 +1697,7 @@ PHP_FUNCTION(stream_is_local)
ZEND_PARSE_PARAMETERS_END();
if (Z_TYPE_P(zstream) == IS_RESOURCE) {
- php_stream_from_zval(stream, zstream);
+ php_stream_from_res(stream, Z_RES_P(zstream));
wrapper = stream->wrapper;
} else {
if (!try_convert_to_string(zstream)) {
diff --git a/main/php_streams.h b/main/php_streams.h
index dcfb3dcede5..37e1f3e01b0 100644
--- a/main/php_streams.h
+++ b/main/php_streams.h
@@ -292,7 +292,7 @@ END_EXTERN_C()
return; \
} \
} while (0)
-#define php_stream_from_res_no_verify(xstr, pzval) (xstr) = (php_stream*)zend_fetch_resource2((res), "stream", php_file_le_stream(), php_file_le_pstream())
+#define php_stream_from_res_no_verify(xstr, res) (xstr) = (php_stream*)zend_fetch_resource2((res), "stream", php_file_le_stream(), php_file_le_pstream())
#define php_stream_from_zval_no_verify(xstr, pzval) (xstr) = (php_stream*)zend_fetch_resource2_ex((pzval), "stream", php_file_le_stream(), php_file_le_pstream())
static zend_always_inline php_stream* php_stream_from_zval_no_verify_no_error(zval *zval) {