|
 |
af9dc8 |
From a374dfab567ff7f0ab0dc150f14cc891b0340b47 Mon Sep 17 00:00:00 2001
|
|
|
af9dc8 |
From: Stanislav Malyshev <stas@php.net>
|
|
|
af9dc8 |
Date: Sat, 21 Jun 2014 19:46:16 -0700
|
|
|
af9dc8 |
Subject: [PATCH] Fix bug #67492: unserialize() SPL ArrayObject /
|
|
|
af9dc8 |
SPLObjectStorage Type Confusion
|
|
|
af9dc8 |
|
|
|
af9dc8 |
---
|
|
|
af9dc8 |
ext/spl/spl_array.c | 2 +-
|
|
|
af9dc8 |
ext/spl/spl_observer.c | 2 +-
|
|
|
af9dc8 |
ext/spl/tests/SplObjectStorage_unserialize_bad.phpt | 5 ++++-
|
|
|
af9dc8 |
3 files changed, 6 insertions(+), 3 deletions(-)
|
|
|
af9dc8 |
|
|
|
af9dc8 |
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
|
|
|
af9dc8 |
index c4b237b..c38065f 100644
|
|
|
af9dc8 |
--- a/ext/spl/spl_array.c
|
|
|
af9dc8 |
+++ b/ext/spl/spl_array.c
|
|
|
af9dc8 |
@@ -1801,7 +1801,7 @@ SPL_METHOD(Array, unserialize)
|
|
|
af9dc8 |
++p;
|
|
|
af9dc8 |
|
|
|
af9dc8 |
ALLOC_INIT_ZVAL(pmembers);
|
|
|
af9dc8 |
- if (!php_var_unserialize(&pmembers, &p, s + buf_len, &var_hash TSRMLS_CC)) {
|
|
|
af9dc8 |
+ if (!php_var_unserialize(&pmembers, &p, s + buf_len, &var_hash TSRMLS_CC) || Z_TYPE_P(pmembers) != IS_ARRAY) {
|
|
|
af9dc8 |
zval_ptr_dtor(&pmembers);
|
|
|
af9dc8 |
goto outexcept;
|
|
|
af9dc8 |
}
|
|
|
af9dc8 |
diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c
|
|
|
af9dc8 |
index 57ddf49..f493154 100644
|
|
|
af9dc8 |
--- a/ext/spl/spl_observer.c
|
|
|
af9dc8 |
+++ b/ext/spl/spl_observer.c
|
|
|
af9dc8 |
@@ -898,7 +898,7 @@ SPL_METHOD(SplObjectStorage, unserialize)
|
|
|
af9dc8 |
++p;
|
|
|
af9dc8 |
|
|
|
af9dc8 |
ALLOC_INIT_ZVAL(pmembers);
|
|
|
af9dc8 |
- if (!php_var_unserialize(&pmembers, &p, s + buf_len, &var_hash TSRMLS_CC)) {
|
|
|
af9dc8 |
+ if (!php_var_unserialize(&pmembers, &p, s + buf_len, &var_hash TSRMLS_CC) || Z_TYPE_P(pmembers) != IS_ARRAY) {
|
|
|
af9dc8 |
zval_ptr_dtor(&pmembers);
|
|
|
af9dc8 |
goto outexcept;
|
|
|
af9dc8 |
}
|
|
|
af9dc8 |
diff --git a/ext/spl/tests/SplObjectStorage_unserialize_bad.phpt b/ext/spl/tests/SplObjectStorage_unserialize_bad.phpt
|
|
|
af9dc8 |
index a525317..8f0676d 100644
|
|
|
af9dc8 |
--- a/ext/spl/tests/SplObjectStorage_unserialize_bad.phpt
|
|
|
af9dc8 |
+++ b/ext/spl/tests/SplObjectStorage_unserialize_bad.phpt
|
|
|
af9dc8 |
@@ -7,6 +7,7 @@ $badblobs = array(
|
|
|
af9dc8 |
'x:i:2;i:0;,i:1;;i:0;,i:2;;m:a:0:{}',
|
|
|
af9dc8 |
'x:i:3;O:8:"stdClass":0:{},O:8:"stdClass":0:{};R:2;,i:1;;O:8:"stdClass":0:{},r:2;;m:a:0:{}',
|
|
|
af9dc8 |
'x:i:3;O:8:"stdClass":0:{},O:8:"stdClass":0:{};r:2;,i:1;;O:8:"stdClass":0:{},r:2;;m:a:0:{}',
|
|
|
af9dc8 |
+'x:i:1;O:8:"stdClass":0:{},N;;m:s:40:"1234567890123456789012345678901234567890"',
|
|
|
af9dc8 |
);
|
|
|
af9dc8 |
foreach($badblobs as $blob) {
|
|
|
af9dc8 |
try {
|
|
|
af9dc8 |
@@ -17,6 +18,7 @@ try {
|
|
|
af9dc8 |
echo $e->getMessage()."\n";
|
|
|
af9dc8 |
}
|
|
|
af9dc8 |
}
|
|
|
af9dc8 |
+echo "DONE\n";
|
|
|
af9dc8 |
--EXPECTF--
|
|
|
af9dc8 |
Error at offset 6 of 34 bytes
|
|
|
af9dc8 |
Error at offset 46 of 89 bytes
|
|
|
af9dc8 |
@@ -42,4 +44,5 @@ object(SplObjectStorage)#2 (1) {
|
|
|
af9dc8 |
}
|
|
|
af9dc8 |
}
|
|
|
af9dc8 |
}
|
|
|
af9dc8 |
-
|
|
|
af9dc8 |
+Error at offset 79 of 78 bytes
|
|
|
af9dc8 |
+DONE
|
|
|
af9dc8 |
--
|
|
|
af9dc8 |
1.9.2
|
|
|
af9dc8 |
|