Merge branch 'PHP-5.4' into PHP-5.5

1 files changed, 9 insertions, 8 deletions

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 23ad158b17..498ed6eeb4 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -3980,15 +3980,16 @@ ZEND_API const char* zend_find_alias_name(zend_class_entry *ce, const char *name
 {
 	zend_trait_alias *alias, **alias_ptr;
 
-	alias_ptr = ce->trait_aliases;
-	alias = *alias_ptr;
-	while (alias) {
-		if (alias->alias_len == len &&
-		    !strncasecmp(name, alias->alias, alias->alias_len)) {
-			return alias->alias;
-		}
-		alias_ptr++;
+	if (alias_ptr = ce->trait_aliases) {
 		alias = *alias_ptr;
+		while (alias) {
+			if (alias->alias_len == len &&
+				!strncasecmp(name, alias->alias, alias->alias_len)) {
+				return alias->alias;
+			}
+			alias_ptr++;
+			alias = *alias_ptr;
+		}
 	}
 
 	return name;