summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2014-05-07 13:50:53 +0800
committerXinchen Hui <laruence@php.net>2014-05-07 13:50:53 +0800
commit8b90b17c8d7cc3def0d81256a021a7e86a2401a1 (patch)
tree57271ddf1c73a9e0e362452f8bb9ef59f6974016
parent9ef21b7606f00a879f15e236c9c1cdf0fa685e31 (diff)
parent38c886a449a54574119a8eb1c6c5e5376acba6d8 (diff)
downloadphp-git-8b90b17c8d7cc3def0d81256a021a7e86a2401a1.tar.gz
Merge branch 'phpng' of git.php.net:php-src into phpng
-rw-r--r--main/php_ini.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/php_ini.c b/main/php_ini.c
index 2b62e80554..d742712758 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -355,6 +355,7 @@ static void php_load_php_extension_cb(void *arg TSRMLS_DC)
static void php_load_zend_extension_cb(void *arg TSRMLS_DC)
{
char *filename = *((char **) arg);
+ const int length = strlen(filename);
if (IS_ABSOLUTE_PATH(filename, length)) {
zend_load_extension(filename TSRMLS_CC);