Skip to content

PHPC-2456: Correctly dereference arrays in type maps #1683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 24, 2024
Merged

PHPC-2456: Correctly dereference arrays in type maps #1683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/contrib/php_array_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,9 @@ char *php_array_zval_to_string(zval *z, int *plen, zend_bool *pfree) {
* zval *php_array_fetchz_array(zval *zarr, zval *key)
*/
static inline zval *php_array_zval_to_array(zval *zarr) {
return (zarr && (Z_TYPE_P(zarr) == IS_ARRAY)) ? zarr : NULL;
if (!zarr) { return NULL; }
ZVAL_DEREF(zarr);
return Z_TYPE_P(zarr) == IS_ARRAY ? zarr : NULL;
}
PHP_ARRAY_FETCH_TYPE_MAP(zval*, array)
#define php_array_fetchc_array(zarr, litstr) \
Expand Down Expand Up @@ -493,8 +495,10 @@ void *php_array_zval_to_resource(zval *z, int le) {
*/
static inline
zval *php_array_zval_to_object(zval *z, zend_class_entry *ce) {
return (z && (Z_TYPE_P(z) == IS_OBJECT) &&
((!ce) || instanceof_function(Z_OBJCE_P(z), ce))) ? z : NULL;
if (!z) { return NULL; }
ZVAL_DEREF(z);
if (Z_TYPE_P(z) != IS_OBJECT) { return NULL; }
return (!ce) || instanceof_function(Z_OBJCE_P(z), ce) ? z : NULL;
}
#define php_array_fetch_object(zarr, key, ce) \
php_array_zval_to_object(php_array_fetch(zarr, key), ce)
Expand Down
22 changes: 22 additions & 0 deletions tests/bson/bug2456-001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--TEST--
PHPC-2456: References passed in a typeMap
--FILE--
<?php
require_once __DIR__ . "/../utils/basic.inc";

$fieldPaths = [];

$typeMap = ['fieldPaths' => &$fieldPaths];

var_dump(MongoDB\BSON\Document::fromPHP([])->toPHP($typeMap));
var_dump(MongoDB\BSON\PackedArray::fromPHP([])->toPHP($typeMap));

?>
===DONE===
<?php exit(0); ?>
--EXPECTF--
object(stdClass)#%d (0) {
}
array(0) {
}
===DONE===