diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/mb/mbutils.c | 9 | ||||
| -rw-r--r-- | src/bin/pg_dump/t/010_dump_connstr.pl | 6 | ||||
| -rw-r--r-- | src/bin/scripts/t/200_connstr.pl | 6 |
3 files changed, 11 insertions, 10 deletions
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c index 8d80ffe78ba..d10b3d0c260 100644 --- a/src/backend/utils/mb/mbutils.c +++ b/src/backend/utils/mb/mbutils.c @@ -1046,11 +1046,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, @@ -1075,7 +1080,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); diff --git a/src/bin/pg_dump/t/010_dump_connstr.pl b/src/bin/pg_dump/t/010_dump_connstr.pl index 80ace65bdbf..28a9eb7dc75 100644 --- a/src/bin/pg_dump/t/010_dump_connstr.pl +++ b/src/bin/pg_dump/t/010_dump_connstr.pl @@ -14,10 +14,8 @@ else plan tests => 14; } -# In a SQL_ASCII database, pgwin32_message_to_UTF16() needs to -# interpret everything as UTF8. We're going to use byte sequences -# that aren't valid UTF-8 strings, so that would fail. Use LATIN1, -# which accepts any byte and has a conversion from each byte to UTF-8. +# We're going to use byte sequences that aren't valid UTF-8 strings. Use +# LATIN1, which accepts any byte and has a conversion from each byte to UTF-8. $ENV{LC_ALL} = 'C'; $ENV{PGCLIENTENCODING} = 'LATIN1'; diff --git a/src/bin/scripts/t/200_connstr.pl b/src/bin/scripts/t/200_connstr.pl index a3aeee762f3..ee2523d0858 100644 --- a/src/bin/scripts/t/200_connstr.pl +++ b/src/bin/scripts/t/200_connstr.pl @@ -7,10 +7,8 @@ use Test::More tests => 3; # Tests to check connection string handling in utilities -# In a SQL_ASCII database, pgwin32_message_to_UTF16() needs to -# interpret everything as UTF8. We're going to use byte sequences -# that aren't valid UTF-8 strings, so that would fail. Use LATIN1, -# which accepts any byte and has a conversion from each byte to UTF-8. +# We're going to use byte sequences that aren't valid UTF-8 strings. Use +# LATIN1, which accepts any byte and has a conversion from each byte to UTF-8. $ENV{LC_ALL} = 'C'; $ENV{PGCLIENTENCODING} = 'LATIN1'; |