ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ws2_32: Move the buffer used by inet_ntoa into the per-thread data.

This commit is contained in:
Dmitry Timoshkov 2013-12-11 17:05:01 +09:00 committed by Alexandre Julliard
parent 3a56f9b956
commit c66c14ddda
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/ws2_32/socket.c
View File

@ -378,6 +378,7 @@ struct per_thread_data
int he_len;
int se_len;
int pe_len;
char ntoa_buffer[16]; /* 4*3 digits + 3 '.' + 1 '\0' */
};
/* internal: routing description information */
@ -3525,17 +3526,12 @@ WS_u_short WINAPI WS_ntohs(WS_u_short netshort)
*/
char* WINAPI WS_inet_ntoa(struct WS_in_addr in)
{
/* use "buffer for dummies" here because some applications have a
* propensity to decode addresses in ws_hostent structure without
* saving them first...
*/
static char dbuffer[16]; /* Yes, 16: 4*3 digits + 3 '.' + 1 '\0' */
char* s = inet_ntoa(*((struct in_addr*)&in));
if( s )
{
strcpy(dbuffer, s);
return dbuffer;
struct per_thread_data *data = get_per_thread_data();
strcpy(data->ntoa_buffer, s);
return data->ntoa_buffer;
}
SetLastError(wsaErrno());
return NULL;

1
dlls/ws2_32/tests/sock.c
View File

@ -7073,7 +7073,6 @@ static void test_inet_ntoa(void)
thread = CreateThread(NULL, 0, inet_ntoa_thread_proc, event, 0, &tid);
WaitForSingleObject(event[0], 3000);
todo_wine
ok(!strcmp(str, "1.2.3.4"), "expected 1.2.3.4, got %s\n", str);
SetEvent(event[1]);