From: Xinchen Hui <laruence@gmail.com>
Date: Sun, 23 Feb 2014 10:22:53 +0000 (+0800)
Subject: Fixed test ext/standard/tests/strings/bug26817.php
X-Git-Tag: POST_PHPNG_MERGE~412^2~578
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=915a8a2d4296abe31f0cadadf91ea2ecdb4958bd;p=php

Fixed test ext/standard/tests/strings/bug26817.php
---

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 33bd74ef7f..8a461ff21f 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 5fe9112076..cceaa48aa6 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 */