diff options
| -rw-r--r-- | ext/com_dotnet/com_extension.c | 2 | ||||
| -rw-r--r-- | main/php_ini.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ext/com_dotnet/com_extension.c b/ext/com_dotnet/com_extension.c index 2de35a58b1..fd2f0a6d70 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 38dcf72747..b3dcd3e546 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); |