From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 3 Mar 2014 08:10:15 +0000 (+0800)
Subject: Fixed NULL pointer dereference
X-Git-Tag: POST_PHPNG_MERGE~412^2~449
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e1d1be148ecf1b9a25fa60685eadc5f20061ae45;p=php

Fixed NULL pointer dereference
---

diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c
index a32d853c25..b32de1856f 100644
--- a/Zend/zend_builtin_functions.c
+++ b/Zend/zend_builtin_functions.c
@@ -1103,7 +1103,9 @@ ZEND_FUNCTION(method_exists)
 	if (Z_TYPE_P(klass) == IS_OBJECT) {
 		ce = Z_OBJCE_P(klass);
 	} else if (Z_TYPE_P(klass) == IS_STRING) {
-		ce = zend_lookup_class(Z_STR_P(klass) TSRMLS_CC);
+		if ((ce = zend_lookup_class(Z_STR_P(klass) TSRMLS_CC)) == NULL) {
+			RETURN_FALSE;
+		}
 	} else {
 		RETURN_FALSE;
 	}