archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

restore the length var and fix the com_dotnet ini

Browse source
This commit is contained in:
Anatol Belski 2014-09-01 20:34:33 +02:00
parent 88d7ca44f6
commit 481bf25b6a
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/com_dotnet/com_extension.c
View file

@ -272,7 +272,7 @@ static PHP_INI_MH(OnTypeLibFileUpdate)
char *strtok_buf = NULL; char *strtok_buf = NULL;
int cached; 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; return FAILURE;
} }

1
main/php_ini.c
View file

@ -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) static void php_load_zend_extension_cb(void *arg TSRMLS_DC)
{ {
char *filename = *((char **) arg); char *filename = *((char **) arg);
const int length = strlen(filename);
if (IS_ABSOLUTE_PATH(filename, length)) { if (IS_ABSOLUTE_PATH(filename, length)) {
zend_load_extension(filename TSRMLS_CC); zend_load_extension(filename TSRMLS_CC);