From: Christoph M. Becker Date: Mon, 29 Jun 2020 17:06:56 +0000 (+0200) Subject: Merge branch 'PHP-7.4' X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf6720d582de512fb6a8dd42c8515bc14e0953c5;p=php Merge branch 'PHP-7.4' * PHP-7.4: Fix #63208: BSTR to PHP string conversion not binary safe --- bf6720d582de512fb6a8dd42c8515bc14e0953c5 diff --cc ext/com_dotnet/php_com_dotnet_internal.h index 4974bb78e3,8481138699..1d089a2ed6 --- a/ext/com_dotnet/php_com_dotnet_internal.h +++ b/ext/com_dotnet/php_com_dotnet_internal.h @@@ -82,8 -84,10 +82,10 @@@ int php_com_saproxy_create(zend_object /* com_olechar.c */ PHP_COM_DOTNET_API char *php_com_olestring_to_string(OLECHAR *olestring, size_t *string_len, int codepage); -PHP_COM_DOTNET_API OLECHAR *php_com_string_to_olestring(char *string, +PHP_COM_DOTNET_API OLECHAR *php_com_string_to_olestring(const char *string, size_t string_len, int codepage); + BSTR php_com_string_to_bstr(zend_string *string, int codepage); + zend_string *php_com_bstr_to_string(BSTR bstr, int codepage); /* com_com.c */