Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0460e4e

Browse files
committed
Fix gai_strerror() thread-safety on Windows.
Commit5579388 removed code that supplied a fallback implementation ofgetaddrinfo(), which was dead code on modern systems. One tiny piece ofthe removed code was still doing something useful on Windows, though:that OS's own gai_strerror()/gai_strerrorA() function returns a pointerto a static buffer that it overwrites each time, so it's notthread-safe. In rare circumstances, a multi-threaded client programcould get an incorrect or corrupted error message.Restore the replacement gai_strerror() function, though now that it'sonly for Windows we can put it into a win32-specific file and cut itdown to the errors that Windows documents. The error messages here aretaken from FreeBSD, because Windows' own messages seemed too verbose.Back-patch to 16.Reviewed-by: Kyotaro Horiguchi <horikyota.ntt@gmail.com>Discussion:https://postgr.es/m/CA%2BhUKGKz%2BF9d2PTiXwfYV7qJw%2BWg2jzACgSDgPizUw7UG%3Di58A%40mail.gmail.com
1 parent4eb2611 commit0460e4e

File tree

6 files changed

+62
-0
lines changed

6 files changed

+62
-0
lines changed

‎configure

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16542,6 +16542,12 @@ esac
1654216542
;;
1654316543
esac
1654416544

16545+
case " $LIBOBJS " in
16546+
*" win32gai_strerror.$ac_objext "* ) ;;
16547+
*) LIBOBJS="$LIBOBJS win32gai_strerror.$ac_objext"
16548+
;;
16549+
esac
16550+
1654516551
case " $LIBOBJS " in
1654616552
*" win32getrusage.$ac_objext "* ) ;;
1654716553
*) LIBOBJS="$LIBOBJS win32getrusage.$ac_objext"

‎configure.ac

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1907,6 +1907,7 @@ if test "$PORTNAME" = "win32"; then
19071907
AC_LIBOBJ(win32env)
19081908
AC_LIBOBJ(win32error)
19091909
AC_LIBOBJ(win32fdatasync)
1910+
AC_LIBOBJ(win32gai_strerror)
19101911
AC_LIBOBJ(win32getrusage)
19111912
AC_LIBOBJ(win32link)
19121913
AC_LIBOBJ(win32ntdll)

‎src/include/port/win32/sys/socket.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,12 @@
2323
#defineERROR PGERROR
2424
#endif
2525

26+
/*
27+
* We don't use the Windows gai_strerror[A] function because it is not
28+
* thread-safe. We define our own in src/port/win32gai_strerror.c.
29+
*/
30+
#undef gai_strerror
31+
32+
externconstchar*gai_strerror(intecode);
33+
2634
#endif/* WIN32_SYS_SOCKET_H */

‎src/port/meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ if host_system == 'windows'
3535
'win32error.c',
3636
'win32fdatasync.c',
3737
'win32fseek.c',
38+
'win32gai_strerror.c',
3839
'win32getrusage.c',
3940
'win32link.c',
4041
'win32ntdll.c',

‎src/port/win32gai_strerror.c

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
/*-------------------------------------------------------------------------
2+
*
3+
* win32gai_strerror.c
4+
* Thread-safe gai_strerror() for Windows.
5+
*
6+
* Portions Copyright (c) 2024, PostgreSQL Global Development Group
7+
*
8+
* IDENTIFICATION
9+
* src/port/win32gai_strerror.c
10+
*
11+
*-------------------------------------------------------------------------
12+
*/
13+
14+
#include<sys/socket.h>
15+
16+
/*
17+
* Windows has gai_strerrorA(), but it is not thread-safe so we avoid it.
18+
*
19+
* https://learn.microsoft.com/en-us/windows/win32/api/ws2tcpip/nf-ws2tcpip-gai_strerrora
20+
*/
21+
constchar*
22+
gai_strerror(interrcode)
23+
{
24+
switch (errcode)
25+
{
26+
caseEAI_AGAIN:
27+
return"Temporary failure in name resolution";
28+
caseEAI_BADFLAGS:
29+
return"Bad value for ai_flags";
30+
caseEAI_FAIL:
31+
return"Non-recoverable failure in name resolution";
32+
caseEAI_FAMILY:
33+
return"ai_family not supported";
34+
caseEAI_MEMORY:
35+
return"Memory allocation failure";
36+
caseEAI_NONAME:
37+
return"Name or service not known";
38+
caseEAI_SERVICE:
39+
return"Servname not supported for ai_socktype";
40+
caseEAI_SOCKTYPE:
41+
return"ai_socktype not supported";
42+
default:
43+
return"Unknown server error";
44+
}
45+
}

‎src/tools/msvc/Mkvcbuild.pm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ sub mkvcbuild
113113
win32env.c win32error.c
114114
win32fdatasync.c
115115
win32fseek.c
116+
win32gai_strerror.c
116117
win32getrusage.c
117118
win32gettimeofday.c
118119
win32link.c

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp