com php-src: Revert "Add optional second arg to unserialize()": ext/standard/basic_functions.c ext/standard/tests/seriali
ze/serialization_error_001.phpt ext/standard/test s/serialize/unserialize_consumed.phpt ext/standard/var. c
| From: | Ferenc Kovacs | Date: | Wed, 11 Jun 2014 12:43:09 +0000 |
| Subject: | com php-src: Revert "Add optional second arg to unserialize()": ext/standard/basic_functions.c ext/standard/tests/seriali ze/serialization_error_001.phpt ext/standard/test s/serialize/unserialize_consumed.phpt ext/standard/var. c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78841@lists.php.net to get a copy of this message | ||
Commit: c38ab260fe3a40cce049c835fb7833de00ab977c
Author: Ferenc Kovacs <tyrael@php.net> Wed, 11 Jun 2014 14:43:09 +0200
Parents: ff74b9b2fc3bf83192d43282ed6d2e14ad47648b
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c38ab260fe3a40cce049c835fb7833de00ab977c
Log:
Revert "Add optional second arg to unserialize()"
This reverts commit cfd104582220d578ab1b78a5991065d038e1f931.
Changed paths:
M ext/standard/basic_functions.c
M ext/standard/tests/serialize/serialization_error_001.phpt
D ext/standard/tests/serialize/unserialize_consumed.phpt
M ext/standard/var.c
Diff:
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 3baa9f4..69e20fd 100644
--- a/ext/standard/basic_functions..c
+++ b/ext/standard/basic_functions.c
@@ -2648,7 +2648,6 @@ ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_unserialize, 0, 0, 1)
ZEND_ARG_INFO(0, variable_representation)
- ZEND_ARG_INFO(1, consumed)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_memory_get_usage, 0, 0, 0)
diff --git a/ext/standard/tests/serialize/serialization_error_001.phpt
b/ext/standard/tests/serialize/serialization_error_001.phpt
index c6c1751..da6f50c 100644
--- a/ext/standard/tests/serialize/serialization_error_001.phpt
+++ b/ext/standard/tests/serialize/serialization_error_001.phpt
@@ -21,7 +21,7 @@ var_dump( unserialize() );
//Test serialize with one more than the expected number of arguments
var_dump( serialize(1,2) );
-var_dump( unserialize(1,$x,2) );
+var_dump( unserialize(1,2) );
echo "Done";
?>
@@ -31,12 +31,12 @@ echo "Done";
Warning: serialize() expects exactly 1 parameter, 0 given in %s on line 16
NULL
-Warning: unserialize() expects at least 1 parameter, 0 given in %s on line 17
+Warning: unserialize() expects exactly 1 parameter, 0 given in %s on line 17
bool(false)
Warning: serialize() expects exactly 1 parameter, 2 given in %s on line 20
NULL
-Warning: unserialize() expects at most 2 parameters, 3 given in %s on line 21
+Warning: unserialize() expects exactly 1 parameter, 2 given in %s on line 21
bool(false)
Done
diff --git a/ext/standard/tests/serialize/unserialize_consumed.phpt
b/ext/standard/tests/serialize/unserialize_consumed.phpt
deleted file mode 100644
index 6cc11e2..0000000
--- a/ext/standard/tests/serialize/unserialize_consumed.phpt
+++ /dev/null
@@ -1,27 +0,0 @@
---TEST--
-Unserialization of partial strings
---FILE--
-<?php
-$data = [123,4.56,true];
-$ser = serialize($data);
-$serlen = strlen($ser);
-
-$unser = unserialize($ser, $consumed);
-echo "Consume full string: ";
-var_dump($serlen == $consumed);
-echo "Return original data: ";
-var_dump($unser === $data);
-
-$ser .= "junk\x01data";
-$unser = unserialize($ser, $consumed);
-echo "Consume full string(junk): ";
-var_dump($serlen == $consumed);
-echo "Return original data(junk): ";
-var_dump($unser === $data);
-
---EXPECT--
-Consume full string: bool(true)
-Return original data: bool(true)
-Consume full string(junk): bool(true)
-Return original data(junk): bool(true)
-
diff --git a/ext/standard/var.c b/ext/standard/var.c
index 930edd6..457f31d 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -943,7 +943,7 @@ PHP_FUNCTION(serialize)
}
/* }}} */
-/* {{{ proto mixed unserialize(string variable_representation[, int &consumed])
+/* {{{ proto mixed unserialize(string variable_representation)
Takes a string representation of variable and recreates it */
PHP_FUNCTION(unserialize)
{
@@ -951,9 +951,8 @@ PHP_FUNCTION(unserialize)
int buf_len;
const unsigned char *p;
php_unserialize_data_t var_hash;
- zval *consumed = NULL;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z", &buf, &buf_len,
&consumed) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &buf, &buf_len) ==
FAILURE) {
RETURN_FALSE;
}
@@ -972,11 +971,6 @@ PHP_FUNCTION(unserialize)
RETURN_FALSE;
}
PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
-
- if (consumed) {
- zval_dtor(consumed);
- ZVAL_LONG(consumed, ((char*)p) - buf);
- }
}
/* }}} */