diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/mb/mbutils.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c index 2e792b4f189..7f4a2f5fcf3 100644 --- a/src/backend/utils/mb/mbutils.c +++ b/src/backend/utils/mb/mbutils.c @@ -1057,11 +1057,16 @@ GetMessageEncoding(void) WCHAR * pgwin32_message_to_UTF16(const char *str, int len, int *utf16len) { + int msgenc = GetMessageEncoding(); WCHAR *utf16; int dstlen; UINT codepage; - codepage = pg_enc2name_tbl[GetMessageEncoding()].codepage; + if (msgenc == PG_SQL_ASCII) + /* No conversion is possible, and SQL_ASCII is never utf16. */ + return NULL; + + codepage = pg_enc2name_tbl[msgenc].codepage; /* * Use MultiByteToWideChar directly if there is a corresponding codepage, @@ -1086,7 +1091,7 @@ pgwin32_message_to_UTF16(const char *str, int len, int *utf16len) { utf8 = (char *) pg_do_encoding_conversion((unsigned char *) str, len, - GetMessageEncoding(), + msgenc, PG_UTF8); if (utf8 != str) len = strlen(utf8); |