com php-src: restore the length var and fix the com_dotnet ini: ext/com_dotnet/com_extension.c main/php_ini .c

From: Date: Mon, 01 Sep 2014 18:34:33 +0000
Subject: com php-src: restore the length var and fix the com_dotnet ini: ext/com_dotnet/com_extension.c main/php_ini .c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-81338@lists.php.net to get a copy of this message
Commit: 481bf25b6ad70fcdc9c10f02b49c86a0bd4a3d0d Author: Anatol Belski <ab@php.net> Mon, 1 Sep 2014 20:34:33 +0200 Parents: 88d7ca44f645c6e1bbdb17affd7a34113911093d Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=481bf25b6ad70fcdc9c10f02b49c86a0bd4a3d0d Log: restore the length var and fix the com_dotnet ini Changed paths: M ext/com_dotnet/com_extension.c M main/php_ini.c Diff: diff --git a/ext/com_dotnet/com_extension.c b/ext/com_dotnet/com_extension.c index 2de35a5..fd2f0a6 100644 --- a/ext/com_dotnet/com_extension.c +++ b/ext/com_dotnet/com_extension.c @@ -272,7 +272,7 @@ static PHP_INI_MH(OnTypeLibFileUpdate) char *strtok_buf = NULL; int cached; - if (!new_value || !new_value[0] || (typelib_file = VCWD_FOPEN(new_value, "r"))==NULL) { + if (NULL == new_value || !new_value->val[0] || (typelib_file = VCWD_FOPEN(new_value->val, "r"))==NULL) { return FAILURE; } diff --git a/main/php_ini.c b/main/php_ini.c index 38dcf72..b3dcd3e 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);

« previous php.cvs (#81338) next »