diff options
| author | Noah Misch <noah@leadboat.com> | 2019-05-12 10:33:05 -0700 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2019-05-12 10:33:05 -0700 |
| commit | d02768ddd1791bab742cf131de726d0a36b3f337 (patch) | |
| tree | a2fa885d9a7076c75d96634467e196ba347ec7e5 /src/backend/utils | |
| parent | 85ccb6899c6c8639bb3e5962ea3bcce5d886e613 (diff) | |
| download | postgresql-d02768ddd1791bab742cf131de726d0a36b3f337.tar.gz postgresql-d02768ddd1791bab742cf131de726d0a36b3f337.zip | |
Fail pgwin32_message_to_UTF16() for SQL_ASCII messages.
The function had been interpreting SQL_ASCII messages as UTF8, throwing
an error when they were invalid UTF8. The new behavior is consistent
with pg_do_encoding_conversion(). This affects LOG_DESTINATION_STDERR
and LOG_DESTINATION_EVENTLOG, which will send untranslated bytes to
write() and ReportEventA(). On buildfarm member bowerbird, enabling
log_connections caused an error whenever the role name was not valid
UTF8. Back-patch to 9.4 (all supported versions).
Discussion: https://postgr.es/m/20190512015615.GD1124997@rfd.leadboat.com
Diffstat (limited to 'src/backend/utils')
| -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 aa18c9ad3d9..dea5dcb3685 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); |