- Yet another rproblematic case with mangled properties

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index a70a69a0c7b63b57a9b93f946ed0e17b665df881..26b3b50a7cf5caa068c34313df759b5cf61d537d 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3101,7 +3101,7 @@ ZEND_API int zend_unmangle_property_name(char *mangled_property, int len, char *
                *prop_name = mangled_property;
                return SUCCESS;
        }
-       if (len < 3) {
+       if (len < 3 || mangled_property[1]==0) {
                zend_error(E_NOTICE, "Illegal member variable name");
                *prop_name = mangled_property;
                return FAILURE;
@@ -3129,7 +3129,7 @@ ZEND_API int zend_u_unmangle_property_name(zend_uchar type, zstr mangled_propert
                        *prop_name = mangled_property;
                        return SUCCESS;
                }
-               if (len < 3) {
+               if (len < 3 || mangled_property.u[1]==0) {
                        zend_error(E_NOTICE, "Illegal member variable name");
                        *prop_name = mangled_property;
                        return FAILURE;