Skip to content
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

Jump to bottom

Fix GH-14639: Member access within null pointer in ext/spl/spl_observer.c #14849

Closed
wants to merge 1 commit into from
Closed

Fix GH-14639: Member access within null pointer in ext/spl/spl_observer.c #14849

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
12 changes: 8 additions & 4 deletions ext/spl/spl_observer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,11 @@ static void spl_object_storage_free_hash(spl_SplObjectStorage *intern, zend_hash
static void spl_object_storage_dtor(zval *element) /* {{{ */
{
spl_SplObjectStorageElement *el = Z_PTR_P(element);
zend_object_release(el->obj);
zval_ptr_dtor(&el->inf);
efree(el);
if (el) {
zend_object_release(el->obj);
zval_ptr_dtor(&el->inf);
efree(el);
}
} /* }}} */

static spl_SplObjectStorageElement* spl_object_storage_get(spl_SplObjectStorage *intern, zend_hash_key *key) /* {{{ */
Expand Down Expand Up @@ -168,8 +170,10 @@ static spl_SplObjectStorageElement *spl_object_storage_attach_handle(spl_SplObje
return pelement;
}

/* NULL initialization necessary because `spl_object_storage_create_element` could bail out due to OOM. */
ZVAL_PTR(entry_zv, NULL);
pelement = spl_object_storage_create_element(obj, inf);
ZVAL_PTR(entry_zv, pelement);
Z_PTR_P(entry_zv) = pelement;
return pelement;
} /* }}} */

Expand Down
21 changes: 21 additions & 0 deletions ext/spl/tests/gh14639.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
--TEST--
GH-14639 (Member access within null pointer in ext/spl/spl_observer.c)
--INI--
memory_limit=2M
--SKIPIF--
<?php
if (getenv("USE_ZEND_ALLOC") === "0") {
die("skip Zend MM disabled");
}
?>
--FILE--
<?php
$b = new SplObjectStorage();
for ($i = 10000; $i > 0; $i--) {
$object = new StdClass();
$object->a = str_repeat("a", 2);
$b->attach($object);
}
?>
--EXPECTF--
Fatal error: Allowed memory size of %d bytes exhausted%s(tried to allocate %d bytes) in %s on line %d
Loading