From: Xinchen Hui <laruence@php.net>
Date: Sat, 28 Mar 2015 06:09:54 +0000 (+0800)
Subject: Merge branch 'bug69315' of https://github.com/laruence/php-src
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~477^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e60b380c553ed09205df6c917d1ebb3849c86c4d;p=php

Merge branch 'bug69315' of https://github.com/laruence/php-src
---

e60b380c553ed09205df6c917d1ebb3849c86c4d
diff --cc ext/opcache/Optimizer/zend_optimizer.c
index de45bf0cd9,90aff7e247..cad023b5ca
--- a/ext/opcache/Optimizer/zend_optimizer.c
+++ b/ext/opcache/Optimizer/zend_optimizer.c
@@@ -111,6 -111,13 +111,13 @@@ int zend_optimizer_add_literal(zend_op_
  	return i;
  }
  
+ int zend_optimizer_is_disabled_func(const char *name, size_t len) {
+ 	zend_function *fbc = (zend_function *)zend_hash_str_find_ptr(EG(function_table), name, len);
+ 
 -	return (fbc->type == ZEND_INTERNAL_FUNCTION &&
++	return (fbc && fbc->type == ZEND_INTERNAL_FUNCTION &&
+ 			fbc->internal_function.handler == ZEND_FN(display_disabled_function));
+ }
+ 
  void zend_optimizer_update_op1_const(zend_op_array *op_array,
                                       zend_op       *opline,
                                       zval          *val)