From: Ilia Alshanetsky <iliaa@php.net>
Date: Mon, 8 Jun 2009 01:26:03 +0000 (+0000)
Subject: Fixed bug #44827 (define() is missing error checks for class constants)
X-Git-Tag: php-5.3.0RC3~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5289261baa822cfd77c496a67fd0ae86af094f46;p=php

Fixed bug #44827 (define() is missing error checks for class constants)
---

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index d1a1de524c..c1726be9f3 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -629,6 +629,7 @@ ZEND_FUNCTION(define)
 	zend_bool non_cs = 0;
 	int case_sensitive = CONST_CS;
 	zend_constant c;
+	char *p;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|b", &name, &name_len, &val, &non_cs) == FAILURE) {
 		return;
@@ -638,6 +639,34 @@ ZEND_FUNCTION(define)
 		case_sensitive = 0;
 	}
 
+	/* class constant, check if there is name and make sure class is valid & exists */
+	if ((p = zend_memnstr(name, "::", sizeof("::") - 1, name + name_len))) {
+		char *class_name;
+		int found;
+		zend_class_entry **ce;
+		ALLOCA_FLAG(use_heap)
+
+		if (p == (name + name_len - sizeof("::") + 1)) {
+			zend_error(E_WARNING, "Class constant must have a name");
+			RETURN_FALSE;
+		} else if (p == name) {
+			zend_error(E_WARNING, "Missing class name");
+			RETURN_FALSE;
+		}
+
+		class_name = do_alloca((p - name + 1), use_heap);
+		zend_str_tolower_copy(class_name, name, (p - name));
+
+		found = zend_hash_find(EG(class_table), class_name, p - name + 1, (void **) &ce);
+
+		if (found != SUCCESS) {
+			zend_error(E_WARNING, "Class '%s' does not exists", class_name);
+			free_alloca(class_name, use_heap);
+			RETURN_FALSE;
+		}
+		free_alloca(class_name, use_heap);
+	}
+
 repeat:
 	switch (Z_TYPE_P(val)) {
 		case IS_LONG: