archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Return only debug props in PDORow

Browse source 
Previously this returned properties of a different object, including
INDIRECTs directly, which violates our invariants. Switch this to
only return properties for debugging purposes, without INDIRECTs.
If someone complains we can extend this to other purposes, as needed.
This commit is contained in:
Nikita Popov 2019-01-10 12:36:08 +01:00
parent 5f7b934f8b
commit a0d0cb847f
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ext/pdo/pdo_stmt.c
View file

@ -2562,27 +2562,28 @@ static void row_dim_delete(zval *object, zval *offset)
php_error_docref(NULL, E_WARNING, "Cannot delete properties from a PDORow"); php_error_docref(NULL, E_WARNING, "Cannot delete properties from a PDORow");
} }
static HashTable *row_get_properties(zval *object) static HashTable *row_get_properties_for(zval *object, zend_prop_purpose purpose)
{ {
pdo_row_t *row = (pdo_row_t *)Z_OBJ_P(object); pdo_row_t *row = (pdo_row_t *)Z_OBJ_P(object);
pdo_stmt_t *stmt = row->stmt; pdo_stmt_t *stmt = row->stmt;
HashTable *props;
int i; int i;
if (stmt == NULL) { if (purpose != ZEND_PROP_PURPOSE_DEBUG || stmt == NULL) {
return NULL; return zend_std_get_properties_for(object, purpose);
} }
if (!stmt->std.properties) { if (!stmt->std.properties) {
rebuild_object_properties(&stmt->std); rebuild_object_properties(&stmt->std);
} }
props = zend_array_dup(stmt->std.properties);
for (i = 0; i < stmt->column_count; i++) { for (i = 0; i < stmt->column_count; i++) {
zval val; zval val;
fetch_value(stmt, &val, i, NULL); fetch_value(stmt, &val, i, NULL);
zend_hash_update(stmt->std.properties, stmt->columns[i].name, &val); zend_hash_update(props, stmt->columns[i].name, &val);
} }
return props;
return stmt->std.properties;
} }
static zend_function *row_method_get( static zend_function *row_method_get(
@ -2685,7 +2686,7 @@ void pdo_stmt_init(void)
pdo_row_object_handlers.write_dimension = row_dim_write; pdo_row_object_handlers.write_dimension = row_dim_write;
pdo_row_object_handlers.has_dimension = row_dim_exists; pdo_row_object_handlers.has_dimension = row_dim_exists;
pdo_row_object_handlers.unset_dimension = row_dim_delete; pdo_row_object_handlers.unset_dimension = row_dim_delete;
pdo_row_object_handlers.get_properties = row_get_properties; pdo_row_object_handlers.get_properties_for = row_get_properties_for;
pdo_row_object_handlers.get_method = row_method_get; pdo_row_object_handlers.get_method = row_method_get;
pdo_row_object_handlers.call_method = row_call_method; pdo_row_object_handlers.call_method = row_call_method;
pdo_row_object_handlers.get_constructor = row_get_ctor; pdo_row_object_handlers.get_constructor = row_get_ctor;