Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 29 additions & 0 deletions Zend/tests/gh22257.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
--TEST--
GH-22257 (Type confusion / OOB read unserializing an Exception with a non-array trace)
--CREDITS--
Igor Sak-Sakovskiy (Positive Technologies)
--FILE--
<?php
/* A crafted, deliberately truncated payload makes the nested value of the typed
* "array $trace" property fail to unserialize. On that failure path the slot used
* to keep the half-built (non-array) value, and the partially-built Exception was
* then exposed to getTraceAsString() through SplHeap's delayed __unserialize(),
* type-confusing the object as a HashTable. The slot is now reset to the property
* default, so the run completes without an out-of-bounds read. */
$n = "\x00";
try {
unserialize(
'O:9:"Exception":1:{s:16:"' . $n . 'Exception' . $n . 'trace";' .
'O:8:"stdClass":2:{s:1:"0";O:10:"SplMaxHeap":2:{i:0;a:0:{}i:1;a:2:{' .
's:5:"flags";i:0;s:13:"heap_elements";a:2:{i:0;s:0:"";i:1;R:1;}}}z}}'
);
} catch (\Throwable $e) {
for (; $e; $e = $e->getPrevious()) {
printf("%s: %s\n", $e::class, $e->getMessage());
}
}
echo "OK\n";
?>
--EXPECTF--
Warning: unserialize(): Error at offset %d of %d bytes in %s on line %d
OK
16 changes: 12 additions & 4 deletions ext/standard/var_unserializer.re
Original file line number Diff line number Diff line change
Expand Up @@ -677,10 +677,18 @@ second_try:
}

if (!php_var_unserialize_internal(data, p, max, var_hash)) {
if (info && Z_ISREF_P(data)) {
/* Add type source even if we failed to unserialize.
* The data is still stored in the property. */
ZEND_REF_ADD_TYPE_SOURCE(Z_REF_P(data), info);
if (info) {
if (Z_ISREF_P(data)) {
ZEND_REF_ADD_TYPE_SOURCE(Z_REF_P(data), info);
} else {
/* "partially unserialized" value might violate the property
* declared type so we restore the default */
zval *tmp = &obj->ce->default_properties_table[OBJ_PROP_TO_NUM(info->offset)];
if (Z_REFCOUNTED_P(data)) {
var_push_dtor_value(var_hash, data);
}
ZVAL_COPY_OR_DUP(data, tmp);
}
}
goto failure;
}
Expand Down
Loading