com php-src: Fixed test ext/standard/tests/strings/bug26817.php: Zend/zend_object_handlers.c ext/standard/http.c
| From: | Dmitry Stogov | Date: | Sun, 23 Feb 2014 10:22:53 +0000 |
| Subject: | com php-src: Fixed test ext/standard/tests/strings/bug26817.php: Zend/zend_object_handlers.c ext/standard/http.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77985@lists.php.net to get a copy of this message | ||
Commit: 915a8a2d4296abe31f0cadadf91ea2ecdb4958bd
Author: Xinchen Hui <laruence@gmail.com> Sun, 23 Feb 2014 18:22:53 +0800
Parents: 5db2503fc0c209abc4d5a69b117166ee3e0dd446
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=915a8a2d4296abe31f0cadadf91ea2ecdb4958bd
Log:
Fixed test ext/standard/tests/strings/bug26817.php
Bugs:
https://bugs.php.net/26817
Changed paths:
M Zend/zend_object_handlers.c
M ext/standard/http.c
Diff:
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 33bd74e..8a461ff 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -368,6 +368,7 @@ ZEND_API int zend_check_property_access(zend_object *zobj, zend_string *prop_inf
zend_unmangle_property_name_ex(prop_info_name->val, prop_info_name->len, &class_name,
&prop_name, &prop_name_len);
ZVAL_STRINGL(&member, prop_name, prop_name_len);
property_info = zend_get_property_info_quick(zobj->ce, &member, 1, NULL TSRMLS_CC);
+ zval_dtor(&member);
if (!property_info) {
return FAILURE;
}
diff --git a/ext/standard/http.c b/ext/standard/http.c
index 5fe9112..cceaa48 100644
--- a/ext/standard/http.c
+++ b/ext/standard/http.c
@@ -141,7 +141,7 @@ PHPAPI int php_url_encode_hash_ex(HashTable *ht, smart_str *formstr,
/* Skip these types */
continue;
} else {
- if (formstr->s->len) {
+ if (formstr->s) {
smart_str_appendl(formstr, arg_sep, arg_sep_len);
}
/* Simple key=value */