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

ws2_32/tests: Fix some buffer overflows in traces.

This commit is contained in:
Alexandre Julliard 2010-09-03 21:07:54 +02:00
parent 75af402307
commit 9f2c51800d
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2629,23 +2629,22 @@ static void get_event_details(int event, int *bit, char *name)
} }
} }
static char *dbgstr_event_seq(const LPARAM *seq) static const char *dbgstr_event_seq(const LPARAM *seq)
{ {
static char message[1024]; static char message[1024];
char name[10]; char name[12];
int len = 1;
message[0] = '['; message[0] = '[';
message[1] = 0; message[1] = 0;
while (*seq) while (*seq)
{ {
get_event_details(WSAGETSELECTEVENT(*seq), NULL, name); get_event_details(WSAGETSELECTEVENT(*seq), NULL, name);
len += sprintf(message + len, "%s(%d) ", name, WSAGETSELECTERROR(*seq));
sprintf(message, "%s%s%s(%d)", message, message[1] == 0 ? "" : " ",
name, WSAGETSELECTERROR(*seq));
seq++; seq++;
} }
strcat(message, "]"); if (len > 1) len--;
strcpy( message + len, "]" );
return message; return message;
} }
@ -2654,7 +2653,8 @@ static char *dbgstr_event_seq_result(SOCKET s, WSANETWORKEVENTS *netEvents)
static char message[1024]; static char message[1024];
struct async_message *curr = messages_received; struct async_message *curr = messages_received;
int index, error, bit = 0; int index, error, bit = 0;
char name[10]; char name[12];
int len = 1;
message[0] = '['; message[0] = '[';
message[1] = 0; message[1] = 0;
@ -2685,10 +2685,10 @@ static char *dbgstr_event_seq_result(SOCKET s, WSANETWORKEVENTS *netEvents)
curr = curr->next; curr = curr->next;
} }
sprintf(message, "%s%s%s(%d)", message, message[1] == 0 ? "" : " ", len += sprintf(message + len, "%s(%d) ", name, error);
name, error);
} }
strcat(message, "]"); if (len > 1) len--;
strcpy( message + len, "]" );
return message; return message;
} }