database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Restore old pgwin32_message_to_UTF16() behavior outside transactions.

Browse Source 
Commit 49c817eab7 replaced with a hard
error the dubious pg_do_encoding_conversion() behavior when outside a
transaction.  Reintroduce the historic soft failure locally within
pgwin32_message_to_UTF16().  This fixes errors when writing messages in
less-common encodings to the Windows event log or console.  Back-patch
to 9.4, where the aforementioned commit first appeared.

Per bug #13427 from Dmitri Bourlatchkov.
This commit is contained in:
Noah Misch
2015-08-14 20:23:09 -04:00
parent 845405a7d8
commit 43adc7a714
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/utils/mb/mbutils.c
View File

@ -1063,7 +1063,8 @@ pgwin32_message_to_UTF16(const char *str, int len, int *utf16len)
/* /*
* Use MultiByteToWideChar directly if there is a corresponding codepage, * Use MultiByteToWideChar directly if there is a corresponding codepage,
* or double conversion through UTF8 if not. * or double conversion through UTF8 if not. Double conversion is needed,
* for example, in an ENCODING=LATIN8, LC_CTYPE=C database.
*/ */
if (codepage != 0) if (codepage != 0)
{ {
@ -1075,12 +1076,21 @@ pgwin32_message_to_UTF16(const char *str, int len, int *utf16len)
{ {
char *utf8; char *utf8;
/*
* XXX pg_do_encoding_conversion() requires a transaction. In the
* absence of one, hope for the input to be valid UTF8.
*/
if (IsTransactionState())
{
utf8 = (char *) pg_do_encoding_conversion((unsigned char *) str, utf8 = (char *) pg_do_encoding_conversion((unsigned char *) str,
len, len,
GetMessageEncoding(), GetMessageEncoding(),
PG_UTF8); PG_UTF8);
if (utf8 != str) if (utf8 != str)
len = strlen(utf8); len = strlen(utf8);
}
else
utf8 = (char *) str;
utf16 = (WCHAR *) palloc(sizeof(WCHAR) * (len + 1)); utf16 = (WCHAR *) palloc(sizeof(WCHAR) * (len + 1));
dstlen = MultiByteToWideChar(CP_UTF8, 0, utf8, len, utf16, len); dstlen = MultiByteToWideChar(CP_UTF8, 0, utf8, len, utf16, len);