archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Don't store the object zval directly

Browse source
This commit is contained in:
Niels Dossche 2025-02-09 19:05:16 +01:00
parent c0d910d506
commit 5eae6d1405
2 changed files with 13 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/sqlite3/php_sqlite3_structs.h
View file

@ -93,7 +93,6 @@ typedef struct _php_sqlite3_result_object php_sqlite3_result;
struct _php_sqlite3_result_object { struct _php_sqlite3_result_object {
php_sqlite3_db_object *db_obj; php_sqlite3_db_object *db_obj;
php_sqlite3_stmt *stmt_obj; php_sqlite3_stmt *stmt_obj;
zval stmt_obj_zval;
/* Cache of column names to speed up repeated fetchArray(SQLITE3_ASSOC) calls. /* Cache of column names to speed up repeated fetchArray(SQLITE3_ASSOC) calls.
* Cache is cleared on reset() and finalize() calls. */ * Cache is cleared on reset() and finalize() calls. */
@ -114,7 +113,6 @@ static inline php_sqlite3_result *php_sqlite3_result_from_obj(zend_object *obj)
struct _php_sqlite3_stmt_object { struct _php_sqlite3_stmt_object {
sqlite3_stmt *stmt; sqlite3_stmt *stmt;
php_sqlite3_db_object *db_obj; php_sqlite3_db_object *db_obj;
zval db_obj_zval;
int initialised; int initialised;

33
ext/sqlite3/sqlite3.c
View file

@ -35,7 +35,7 @@ ZEND_DECLARE_MODULE_GLOBALS(sqlite3)
static PHP_GINIT_FUNCTION(sqlite3); static PHP_GINIT_FUNCTION(sqlite3);
static int php_sqlite3_authorizer(void *autharg, int action, const char *arg1, const char *arg2, const char *arg3, const char *arg4); static int php_sqlite3_authorizer(void *autharg, int action, const char *arg1, const char *arg2, const char *arg3, const char *arg4);
static void sqlite3_param_dtor(zval *data); static void sqlite3_param_dtor(zval *data);
static int php_sqlite3_compare_stmt_zval_free(php_sqlite3_stmt **stmt_obj_ptr, zval *statement); static int php_sqlite3_compare_stmt_free(php_sqlite3_stmt **stmt_obj_ptr, sqlite3_stmt *statement);
#define SQLITE3_CHECK_INITIALIZED(db_obj, member, class_name) \ #define SQLITE3_CHECK_INITIALIZED(db_obj, member, class_name) \
if (!(db_obj) || !(member)) { \ if (!(db_obj) || !(member)) { \
@ -525,7 +525,7 @@ PHP_METHOD(SQLite3, prepare)
object_init_ex(return_value, php_sqlite3_stmt_entry); object_init_ex(return_value, php_sqlite3_stmt_entry);
stmt_obj = Z_SQLITE3_STMT_P(return_value); stmt_obj = Z_SQLITE3_STMT_P(return_value);
stmt_obj->db_obj = db_obj; stmt_obj->db_obj = db_obj;
ZVAL_OBJ_COPY(&stmt_obj->db_obj_zval, Z_OBJ_P(object)); Z_ADDREF_P(object);
errcode = sqlite3_prepare_v2(db_obj->db, ZSTR_VAL(sql), ZSTR_LEN(sql), &(stmt_obj->stmt), NULL); errcode = sqlite3_prepare_v2(db_obj->db, ZSTR_VAL(sql), ZSTR_LEN(sql), &(stmt_obj->stmt), NULL);
if (errcode != SQLITE_OK) { if (errcode != SQLITE_OK) {
@ -577,7 +577,7 @@ PHP_METHOD(SQLite3, query)
object_init_ex(&stmt, php_sqlite3_stmt_entry); object_init_ex(&stmt, php_sqlite3_stmt_entry);
stmt_obj = Z_SQLITE3_STMT_P(&stmt); stmt_obj = Z_SQLITE3_STMT_P(&stmt);
stmt_obj->db_obj = db_obj; stmt_obj->db_obj = db_obj;
ZVAL_OBJ_COPY(&stmt_obj->db_obj_zval, Z_OBJ_P(object)); Z_ADDREF_P(object);
return_code = sqlite3_prepare_v2(db_obj->db, ZSTR_VAL(sql), ZSTR_LEN(sql), &(stmt_obj->stmt), NULL); return_code = sqlite3_prepare_v2(db_obj->db, ZSTR_VAL(sql), ZSTR_LEN(sql), &(stmt_obj->stmt), NULL);
if (return_code != SQLITE_OK) { if (return_code != SQLITE_OK) {
@ -594,7 +594,6 @@ PHP_METHOD(SQLite3, query)
result->stmt_obj = stmt_obj; result->stmt_obj = stmt_obj;
result->column_names = NULL; result->column_names = NULL;
result->column_count = -1; result->column_count = -1;
ZVAL_OBJ(&result->stmt_obj_zval, Z_OBJ(stmt));
return_code = sqlite3_step(result->stmt_obj->stmt); return_code = sqlite3_step(result->stmt_obj->stmt);
@ -1407,7 +1406,7 @@ PHP_METHOD(SQLite3Stmt, close)
SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3); SQLITE3_CHECK_INITIALIZED(stmt_obj->db_obj, stmt_obj->initialised, SQLite3);
zend_llist_del_element(&(stmt_obj->db_obj->free_list), object, (int (*)(void *, void *)) php_sqlite3_compare_stmt_zval_free); zend_llist_del_element(&(stmt_obj->db_obj->free_list), stmt_obj, (int (*)(void *, void *)) php_sqlite3_compare_stmt_free);
RETURN_TRUE; RETURN_TRUE;
} }
@ -1788,7 +1787,7 @@ PHP_METHOD(SQLite3Stmt, execute)
result->stmt_obj = stmt_obj; result->stmt_obj = stmt_obj;
result->column_names = NULL; result->column_names = NULL;
result->column_count = -1; result->column_count = -1;
ZVAL_OBJ_COPY(&result->stmt_obj_zval, Z_OBJ_P(object)); Z_ADDREF_P(object);
break; break;
} }
@ -1832,7 +1831,7 @@ PHP_METHOD(SQLite3Stmt, __construct)
} }
stmt_obj->db_obj = db_obj; stmt_obj->db_obj = db_obj;
ZVAL_OBJ_COPY(&stmt_obj->db_obj_zval, Z_OBJ_P(db_zval)); Z_ADDREF_P(db_zval);
errcode = sqlite3_prepare_v2(db_obj->db, ZSTR_VAL(sql), ZSTR_LEN(sql), &(stmt_obj->stmt), NULL); errcode = sqlite3_prepare_v2(db_obj->db, ZSTR_VAL(sql), ZSTR_LEN(sql), &(stmt_obj->stmt), NULL);
if (errcode != SQLITE_OK) { if (errcode != SQLITE_OK) {
@ -2029,8 +2028,8 @@ PHP_METHOD(SQLite3Result, finalize)
/* We need to finalize an internal statement */ /* We need to finalize an internal statement */
if (result_obj->is_prepared_statement == 0) { if (result_obj->is_prepared_statement == 0) {
zend_llist_del_element(&(result_obj->db_obj->free_list), &result_obj->stmt_obj_zval, zend_llist_del_element(&(result_obj->db_obj->free_list), &result_obj->stmt_obj,
(int (*)(void *, void *)) php_sqlite3_compare_stmt_zval_free); (int (*)(void *, void *)) php_sqlite3_compare_stmt_free);
} else { } else {
sqlite3_reset(result_obj->stmt_obj->stmt); sqlite3_reset(result_obj->stmt_obj->stmt);
} }
@ -2145,12 +2144,6 @@ static void php_sqlite3_free_list_dtor(void **item)
} }
/* }}} */ /* }}} */
static int php_sqlite3_compare_stmt_zval_free(php_sqlite3_stmt **stmt_obj_ptr, zval *statement ) /* {{{ */
{
return ((*stmt_obj_ptr)->initialised && Z_OBJ_P(statement) == &(*stmt_obj_ptr)->zo);
}
/* }}} */
static int php_sqlite3_compare_stmt_free(php_sqlite3_stmt **stmt_obj_ptr, sqlite3_stmt *statement ) /* {{{ */ static int php_sqlite3_compare_stmt_free(php_sqlite3_stmt **stmt_obj_ptr, sqlite3_stmt *statement ) /* {{{ */
{ {
return ((*stmt_obj_ptr)->initialised && statement == (*stmt_obj_ptr)->stmt); return ((*stmt_obj_ptr)->initialised && statement == (*stmt_obj_ptr)->stmt);
@ -2269,8 +2262,8 @@ static void php_sqlite3_stmt_object_free_storage(zend_object *object) /* {{{ */
(int (*)(void *, void *)) php_sqlite3_compare_stmt_free); (int (*)(void *, void *)) php_sqlite3_compare_stmt_free);
} }
if (!Z_ISUNDEF(intern->db_obj_zval)) { if (intern->db_obj) {
zval_ptr_dtor(&intern->db_obj_zval); OBJ_RELEASE(&intern->db_obj->zo);
} }
zend_object_std_dtor(&intern->zo); zend_object_std_dtor(&intern->zo);
@ -2283,12 +2276,12 @@ static void php_sqlite3_result_object_free_storage(zend_object *object) /* {{{ *
sqlite3result_clear_column_names_cache(intern); sqlite3result_clear_column_names_cache(intern);
if (!Z_ISNULL(intern->stmt_obj_zval)) { if (intern->stmt_obj) {
if (intern->stmt_obj && intern->stmt_obj->initialised) { if (intern->stmt_obj->initialised) {
sqlite3_reset(intern->stmt_obj->stmt); sqlite3_reset(intern->stmt_obj->stmt);
} }
zval_ptr_dtor(&intern->stmt_obj_zval); OBJ_RELEASE(&intern->stmt_obj->zo);
} }
zend_object_std_dtor(&intern->zo); zend_object_std_dtor(&intern->zo);