Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)

diff --git a/NEWS b/NEWS
index 7d23ec0ede96284f0772629c462b26d7675135bd..4a848548aba136213e79399f7b1bbf34c4ea1c82 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,8 @@ PHP                                                                        NEWS
     which affected builds against libpq < 7.3. (Adam)
 
 - SPL:
+  . Fixed bug #67539 (ArrayIterator use-after-free due to object change during 
+    sorting). (research at insighti dot org, Laruence)
   . Fixed bug #67538 (SPL Iterators use-after-free). (Laruence)
 
 - Streams:

diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index 8392e72714b80483641b1a0d2b6e6389e3c22959..0fe47b651c13f80c35e612de5cf69ea306095fe6 100644 (file)
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -1733,6 +1733,7 @@ SPL_METHOD(Array, unserialize)
        const unsigned char *p, *s;
        php_unserialize_data_t var_hash;
        zval *pmembers, *pflags = NULL;
+       HashTable *aht;
        long flags;
 
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &buf, &buf_len) == FAILURE) {
@@ -1744,6 +1745,12 @@ SPL_METHOD(Array, unserialize)
                return;
        }
 
+       aht = spl_array_get_hash_table(intern, 0 TSRMLS_CC);
+       if (aht->nApplyCount > 0) {
+               zend_error(E_WARNING, "Modification of ArrayObject during sorting is prohibited");
+               return;
+       }
+
        /* storage */
        s = p = (const unsigned char*)buf;
        PHP_VAR_UNSERIALIZE_INIT(var_hash);

diff --git a/ext/spl/tests/bug67539.phpt b/ext/spl/tests/bug67539.phpt
new file mode 100644 (file)
index 0000000..8bab2a8
--- /dev/null
+++ b/ext/spl/tests/bug67539.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Bug #67539 (ArrayIterator use-after-free due to object change during sorting)
+--FILE--
+<?php
+
+$it = new ArrayIterator(array_fill(0,2,'X'), 1 );
+
+function badsort($a, $b) {
+        $GLOBALS['it']->unserialize($GLOBALS['it']->serialize());
+        return TRUE;
+}
+
+$it->uksort('badsort');
+--EXPECTF--
+Warning: Modification of ArrayObject during sorting is prohibited in %sbug67539.php on line %d