Merge branch 'PHP-7.0'

Conflicts: Zend/zend_constants.c
gyx1000 · May 2, 2016 · 0ce7189 · 0ce7189
2 parents 5e10735 + ec7c3c2
commit 0ce7189
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 30 deletions.
diff --git a/Zend/tests/invalid_parent_const_ref_leak.phpt b/Zend/tests/invalid_parent_const_ref_leak.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Leak when using an invalid parent:: reference in a constant definition
+--FILE--
+<?php
+
+class A {
+    const B = parent::C;
+}
+
+try {
+    A::B;
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Cannot access parent:: when current class scope has no parent
diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c
@@ -311,7 +311,6 @@ ZEND_API zval *zend_get_constant_ex(zend_string *cname, zend_class_entry *scope,
 	zend_constant *c;
 	const char *colon;
 	zend_class_entry *ce = NULL;
-	zend_string *class_name;
 	const char *name = ZSTR_VAL(cname);
 	size_t name_len = ZSTR_LEN(cname);
 
@@ -327,81 +326,66 @@ ZEND_API zval *zend_get_constant_ex(zend_string *cname, zend_class_entry *scope,
 		int class_name_len = colon - name - 1;
 		size_t const_name_len = name_len - class_name_len - 2;
 		zend_string *constant_name = zend_string_init(colon + 1, const_name_len, 0);
-		char *lcname;
+		zend_string *class_name = zend_string_init(name, class_name_len, 0);
 		zval *ret_constant = NULL;
-		ALLOCA_FLAG(use_heap)
-
-		class_name = zend_string_init(name, class_name_len, 0);
-		lcname = do_alloca(class_name_len + 1, use_heap);
-		zend_str_tolower_copy(lcname, name, class_name_len);
 
-		if (class_name_len == sizeof("self")-1 &&
-		    !memcmp(lcname, "self", sizeof("self")-1)) {
+		if (zend_string_equals_literal_ci(class_name, "self")) {
 			if (UNEXPECTED(!scope)) {
 				zend_throw_error(NULL, "Cannot access self:: when no class scope is active");
-				return NULL;
+				goto failure;
 			}
 			ce = scope;
-		} else if (class_name_len == sizeof("parent")-1 &&
-		           !memcmp(lcname, "parent", sizeof("parent")-1)) {
+		} else if (zend_string_equals_literal_ci(class_name, "parent")) {
 			if (UNEXPECTED(!scope)) {
 				zend_throw_error(NULL, "Cannot access parent:: when no class scope is active");
-				return NULL;
+				goto failure;
 			} else if (UNEXPECTED(!scope->parent)) {
 				zend_throw_error(NULL, "Cannot access parent:: when current class scope has no parent");
-				return NULL;
+				goto failure;
 			} else {
 				ce = scope->parent;
 			}
-		} else if (class_name_len == sizeof("static")-1 &&
-		           !memcmp(lcname, "static", sizeof("static")-1)) {
+		} else if (zend_string_equals_literal_ci(class_name, "static")) {
 			ce = zend_get_called_scope(EG(current_execute_data));
 			if (UNEXPECTED(!ce)) {
 				zend_throw_error(NULL, "Cannot access static:: when no class scope is active");
-				return NULL;
+				goto failure;
 			}
 		} else {
 			ce = zend_fetch_class(class_name, flags);
 		}
-		free_alloca(lcname, use_heap);
 		if (ce) {
 			zend_class_constant *c = zend_hash_find_ptr(&ce->constants_table, constant_name);
 			if (c == NULL) {
 				if ((flags & ZEND_FETCH_CLASS_SILENT) == 0) {
 					zend_throw_error(NULL, "Undefined class constant '%s::%s'", ZSTR_VAL(class_name), ZSTR_VAL(constant_name));
-					zend_string_release(class_name);
-					zend_string_free(constant_name);
-					return NULL;
+					goto failure;
 				}
 				ret_constant = NULL;
 			} else {
 				if (!zend_verify_const_access(c, scope)) {
 					zend_throw_error(NULL, "Cannot access %s const %s::%s", zend_visibility_string(Z_ACCESS_FLAGS(c->value)), ZSTR_VAL(class_name), ZSTR_VAL(constant_name));
-					zend_string_release(class_name);
-					zend_string_free(constant_name);
-					return NULL;
+					goto failure;
 				}
 				ret_constant = &c->value;
 			}
 		}
+
 		if (ret_constant && Z_CONSTANT_P(ret_constant)) {
 			if (Z_TYPE_P(ret_constant) == IS_CONSTANT_AST) {
 				if (IS_CONSTANT_VISITED(ret_constant)) {
 					zend_throw_error(NULL, "Cannot declare self-referencing constant '%s::%s'", ZSTR_VAL(class_name), ZSTR_VAL(constant_name));
-					zend_string_release(class_name);
-					zend_string_free(constant_name);
-					return NULL;
+					goto failure;
 				}
 				MARK_CONSTANT_VISITED(ret_constant);
 			}
 			if (UNEXPECTED(zval_update_constant_ex(ret_constant, ce) != SUCCESS)) {
 				RESET_CONSTANT_VISITED(ret_constant);
-				zend_string_release(class_name);
-				zend_string_free(constant_name);
-				return NULL;
+				goto failure;
 			}
 			RESET_CONSTANT_VISITED(ret_constant);
 		}
+failure:
 		zend_string_release(class_name);
 		zend_string_free(constant_name);
 		return ret_constant;