com php-src: Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion: ext/spl/spl_array.c ext/ spl/spl_observer.c
ext/spl/tests/SplObjectStorage_unser ialize_bad.phpt
| From: | JulienPauli | Date: | Wed, 25 Jun 2014 12:53:13 +0000 |
| Subject: | com php-src: Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion: ext/spl/spl_array.c ext/ spl/spl_observer.c ext/spl/tests/SplObjectStorage_unser ialize_bad.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79067@lists.php.net to get a copy of this message | ||
Commit: d9c5a1d26815cfe05be5803cb0c02254c534efaa
Author: Stanislav Malyshev <stas@php.net> Sat, 21 Jun 2014 19:46:16 -0700
Committer: Julien Pauli <jpauli@php.net> Wed, 25 Jun 2014 14:53:13 +0200
Parents: a6b7fdeb2d68c33758cca1fbb03dc0b2b1f4e107
Branches: PHP-5.5.14
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d9c5a1d26815cfe05be5803cb0c02254c534efaa
Log:
Fix bug #67492: unserialize() SPL ArrayObject / SPLObjectStorage Type Confusion
Bugs:
https://bugs.php.net/67492
Changed paths:
M ext/spl/spl_array.c
M ext/spl/spl_observer.c
M ext/spl/tests/SplObjectStorage_unserialize_bad.phpt
Diff:
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
index 8d3b404..8392e72 100644
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@ -1796,7 +1796,7 @@ SPL_METHOD(Array, unserialize)
++p;
ALLOC_INIT_ZVAL(pmembers);
- if (!php_var_unserialize(&pmembers, &p, s + buf_len, &var_hash TSRMLS_CC)) {
+ if (!php_var_unserialize(&pmembers, &p, s + buf_len, &var_hash TSRMLS_CC) ||
Z_TYPE_P(pmembers) != IS_ARRAY) {
zval_ptr_dtor(&pmembers);
goto outexcept;
}
diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c
index 1a706f7..da9110b 100644
--- a/ext/spl/spl_observer.c
+++ b/ext/spl/spl_observer.c
@@ -898,7 +898,7 @@ SPL_METHOD(SplObjectStorage, unserialize)
++p;
ALLOC_INIT_ZVAL(pmembers);
- if (!php_var_unserialize(&pmembers, &p, s + buf_len, &var_hash TSRMLS_CC)) {
+ if (!php_var_unserialize(&pmembers, &p, s + buf_len, &var_hash TSRMLS_CC) ||
Z_TYPE_P(pmembers) != IS_ARRAY) {
zval_ptr_dtor(&pmembers);
goto outexcept;
}
diff --git a/ext/spl/tests/SplObjectStorage_unserialize_bad.phpt
b/ext/spl/tests/SplObjectStorage_unserialize_bad.phpt
index a525317..8f0676d 100644
--- a/ext/spl/tests/SplObjectStorage_unserialize_bad.phpt
+++ b/ext/spl/tests/SplObjectStorage_unserialize_bad.phpt
@@ -7,6 +7,7 @@ $badblobs = array(
'x:i:2;i:0;,i:1;;i:0;,i:2;;m:a:0:{}',
'x:i:3;O:8:"stdClass":0:{},O:8:"stdClass":0:{};R:2;,i:1;;O:8:"stdClass":0:{},r:2;;m:a:0:{}',
'x:i:3;O:8:"stdClass":0:{},O:8:"stdClass":0:{};r:2;,i:1;;O:8:"stdClass":0:{},r:2;;m:a:0:{}',
+'x:i:1;O:8:"stdClass":0:{},N;;m:s:40:"1234567890123456789012345678901234567890"',
);
foreach($badblobs as $blob) {
try {
@@ -17,6 +18,7 @@ try {
echo $e->getMessage()."\n";
}
}
+echo "DONE\n";
--EXPECTF--
Error at offset 6 of 34 bytes
Error at offset 46 of 89 bytes
@@ -42,4 +44,5 @@ object(SplObjectStorage)#2 (1) {
}
}
}
-
+Error at offset 79 of 78 bytes
+DONE