From: Stanislav Malyshev <stas@php.net>
Date: Wed, 21 Feb 2007 01:21:24 +0000 (+0000)
Subject: MF5.2: CreateInstance requires BSTR (should fix #33188)
X-Git-Tag: RELEASE_1_0_1~203
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f2357eb4e8bfcfc5c1711fe60eb2164a6b70ee9;p=php

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 6c1c8fe95a..8660daf4c5 100644
--- 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;