From: Pierre Joye Date: Thu, 20 Jan 2011 06:44:16 +0000 (+0000) Subject: - init err X-Git-Tag: php-5.4.0alpha1~191^2~340 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aac73eb84ae9fcf759180fd2e53ad63367658cd2;p=php - init err --- diff --git a/ext/com_dotnet/com_olechar.c b/ext/com_dotnet/com_olechar.c index 409fd810dd..657d45b55d 100644 --- a/ext/com_dotnet/com_olechar.c +++ b/ext/com_dotnet/com_olechar.c @@ -79,7 +79,6 @@ PHPAPI char *php_com_olestring_to_string(OLECHAR *olestring, uint *string_len, i length = WideCharToMultiByte(codepage, 0, olestring, -1, string, length, NULL, NULL); ok = length > 0; } else { - err = GetLastError(); string = (char*)emalloc(sizeof(char)); *string = '\0'; ok = FALSE; @@ -87,7 +86,9 @@ PHPAPI char *php_com_olestring_to_string(OLECHAR *olestring, uint *string_len, i } if (!ok) { - char *msg = php_win32_error_to_msg(err); + char *msg; + err = GetLastError(); + msg = php_win32_error_to_msg(err); php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not convert string from unicode: `%s'", msg);