Alexandre Julliard : ws2_32/tests: Fix some buffer overflows in traces.
Alexandre Julliard
julliard at winehq.org
Mon Sep 6 13:53:10 CDT 2010
Module: wine
Branch: master
Commit: 9f2c51800dacf11cf93dc4aeb5d5ea6c3c9d6cfd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f2c51800dacf11cf93dc4aeb5d5ea6c3c9d6cfd
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Sep 3 21:07:54 2010 +0200
ws2_32/tests: Fix some buffer overflows in traces.
---
dlls/ws2_32/tests/sock.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index e61d550..631fcda 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -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];
- char name[10];
+ char name[12];
+ int len = 1;
message[0] = '[';
message[1] = 0;
while (*seq)
{
get_event_details(WSAGETSELECTEVENT(*seq), NULL, name);
-
- sprintf(message, "%s%s%s(%d)", message, message[1] == 0 ? "" : " ",
- name, WSAGETSELECTERROR(*seq));
-
+ len += sprintf(message + len, "%s(%d) ", name, WSAGETSELECTERROR(*seq));
seq++;
}
- strcat(message, "]");
+ if (len > 1) len--;
+ strcpy( message + len, "]" );
return message;
}
@@ -2654,7 +2653,8 @@ static char *dbgstr_event_seq_result(SOCKET s, WSANETWORKEVENTS *netEvents)
static char message[1024];
struct async_message *curr = messages_received;
int index, error, bit = 0;
- char name[10];
+ char name[12];
+ int len = 1;
message[0] = '[';
message[1] = 0;
@@ -2685,10 +2685,10 @@ static char *dbgstr_event_seq_result(SOCKET s, WSANETWORKEVENTS *netEvents)
curr = curr->next;
}
- sprintf(message, "%s%s%s(%d)", message, message[1] == 0 ? "" : " ",
- name, error);
+ len += sprintf(message + len, "%s(%d) ", name, error);
}
- strcat(message, "]");
+ if (len > 1) len--;
+ strcpy( message + len, "]" );
return message;
}
More information about the wine-cvs
mailing list