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

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 33bd74ef7f51f12c48bf7d509f92770f42fc1eef..8a461ff21fda1209f33403c2f02cf930f44d2150 100644 (file)
--- 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 5fe9112076be194e330edb66e1ea80d28b7f644d..cceaa48aa6ecac8c929c97eec3b9718a4e3b1ce6 100644 (file)
--- 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 */