restore the length var and fix the com_dotnet ini

diff --git a/ext/com_dotnet/com_extension.c b/ext/com_dotnet/com_extension.c
index 2de35a58b1ab223cacd8ebdd00bdf06982ae0118..fd2f0a6d7043990450dfeec7f1f5c8c540ae4342 100644 (file)
--- 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 38dcf72747f4fb7c38fafb485dadd482e7454868..b3dcd3e546ca72a78f4a147428455e22499b9edb 100644 (file)
--- 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);