MF5.2: CreateInstance requires BSTR (should fix #33188)

diff --git a/ext/com_dotnet/com_dotnet.c b/ext/com_dotnet/com_dotnet.c
index 6c1c8fe95a5ca20f22df1997846a8628ac71bee2..8660daf4c56309260b27edef8c1fe987bd51cca1 100644 (file)
--- a/ext/com_dotnet/com_dotnet.c
+++ b/ext/com_dotnet/com_dotnet.c
@@ -188,6 +188,7 @@ PHP_FUNCTION(com_dotnet_create_instance)
        int assembly_name_len, datatype_name_len;
        struct dotnet_runtime_stuff *stuff;
        OLECHAR *oleassembly, *oletype;
+       BSTR oleassembly_sys, oletype_sys;
        HRESULT hr;
        int ret = FAILURE;
        char *where = "";
@@ -223,10 +224,14 @@ PHP_FUNCTION(com_dotnet_create_instance)
 
        oletype = php_com_string_to_olestring(datatype_name, datatype_name_len, obj->code_page TSRMLS_CC);
        oleassembly = php_com_string_to_olestring(assembly_name, assembly_name_len, obj->code_page TSRMLS_CC);
+       oletype_sys = SysAllocString(oletype);
+       oleassembly_sys = SysAllocString(oleassembly);
        where = "CreateInstance";
-       hr = stuff->dotnet_domain->lpVtbl->CreateInstance(stuff->dotnet_domain, oleassembly, oletype, &unk);
+       hr = stuff->dotnet_domain->lpVtbl->CreateInstance(stuff->dotnet_domain, oleassembly_sys, oletype_sys, &unk);
        efree(oletype);
        efree(oleassembly);
+       SysFreeString(oletype_sys);
+       SysFreeString(oleassembly_sys);
 
        if (SUCCEEDED(hr)) {
                VARIANT unwrapped;
@@ -275,8 +280,9 @@ PHP_FUNCTION(com_dotnet_create_instance)
                char buf[1024];
                char *err = php_win_err(hr);
                snprintf(buf, sizeof(buf), "Failed to instantiate .Net object [%s] [0x%08x] %s", where, hr, err);
-               if (err)
+               if (err && err[0]) {
                        LocalFree(err);
+               }
                php_com_throw_exception(hr, buf TSRMLS_CC);
                ZVAL_NULL(object);
                return;