]> granicus.if.org Git - php/commitdiff
ws
authorDmitry Stogov <dmitry@zend.com>
Mon, 22 Jan 2018 10:37:48 +0000 (13:37 +0300)
committerDmitry Stogov <dmitry@zend.com>
Mon, 22 Jan 2018 10:37:48 +0000 (13:37 +0300)
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re

index 2af099524ce8597caaa43ae5194da5ab31a8d507..b42e905f0750bd2f3bd714a5b04f6dc0dfcd7100 100644 (file)
@@ -440,7 +440,7 @@ string_key:
                                                && zend_hash_num_elements(&Z_OBJCE_P(rval)->properties_info) > 0) {
                                        zend_property_info *existing_propinfo;
                                        zend_string *new_key;
-                                       const char *unmangled_class = NULL; 
+                                       const char *unmangled_class = NULL;
                                        const char *unmangled_prop;
                                        size_t unmangled_prop_len;
                                        zend_string *unmangled;
@@ -453,7 +453,7 @@ string_key:
                                        unmangled = zend_string_init(unmangled_prop, unmangled_prop_len, 0);
 
                                        existing_propinfo = zend_hash_find_ptr(&Z_OBJCE_P(rval)->properties_info, unmangled);
-                                       if ((existing_propinfo != NULL) 
+                                       if ((existing_propinfo != NULL)
                                                        && (existing_propinfo->flags & ZEND_ACC_PPP_MASK)) {
                                                if (existing_propinfo->flags & ZEND_ACC_PROTECTED) {
                                                        new_key = zend_mangle_property_name(
index 41b0c80bf22f4a339d99fb3b0ab28c8b3381eced..00507b085436ecb08bc9ec3f39657e9614710123 100644 (file)
@@ -444,7 +444,7 @@ string_key:
                                                && zend_hash_num_elements(&Z_OBJCE_P(rval)->properties_info) > 0) {
                                        zend_property_info *existing_propinfo;
                                        zend_string *new_key;
-                                       const char *unmangled_class = NULL; 
+                                       const char *unmangled_class = NULL;
                                        const char *unmangled_prop;
                                        size_t unmangled_prop_len;
                                        zend_string *unmangled;
@@ -457,7 +457,7 @@ string_key:
                                        unmangled = zend_string_init(unmangled_prop, unmangled_prop_len, 0);
 
                                        existing_propinfo = zend_hash_find_ptr(&Z_OBJCE_P(rval)->properties_info, unmangled);
-                                       if ((existing_propinfo != NULL) 
+                                       if ((existing_propinfo != NULL)
                                                        && (existing_propinfo->flags & ZEND_ACC_PPP_MASK)) {
                                                if (existing_propinfo->flags & ZEND_ACC_PROTECTED) {
                                                        new_key = zend_mangle_property_name(