diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-06-29 19:06:56 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-06-29 19:06:56 +0200 |
| commit | bf6720d582de512fb6a8dd42c8515bc14e0953c5 (patch) | |
| tree | 62ef1c490dbe33203d4350cc9978c7abfe50f5c1 /ext/com_dotnet/php_com_dotnet_internal.h | |
| parent | 43b5d5834197bef731a06f8ea025550df08c3fd1 (diff) | |
| parent | 4af69b84779c1e13e0d98a8eac18a81c0d61f283 (diff) | |
| download | php-git-bf6720d582de512fb6a8dd42c8515bc14e0953c5.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #63208: BSTR to PHP string conversion not binary safe
Diffstat (limited to 'ext/com_dotnet/php_com_dotnet_internal.h')
| -rw-r--r-- | ext/com_dotnet/php_com_dotnet_internal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/com_dotnet/php_com_dotnet_internal.h b/ext/com_dotnet/php_com_dotnet_internal.h index 4974bb78e3..1d089a2ed6 100644 --- a/ext/com_dotnet/php_com_dotnet_internal.h +++ b/ext/com_dotnet/php_com_dotnet_internal.h @@ -84,6 +84,8 @@ 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(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 */ |