diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2001-02-08 21:58:29 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2001-02-08 21:58:29 +0000 |
| commit | 3c3e71b954a60752c1c3e3edd18bb61944c88cc3 (patch) | |
| tree | 0e2b5478cb73ded48eaa4c5c5796b8adb099accb /usr.bin | |
| parent | f2ea9e80ef58d577847e45e4e77a4d1882f2ff45 (diff) | |
nuke sprintf, ok deraadt@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/channels.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c index bdf363fc48e..da9262ecd8b 100644 --- a/usr.bin/ssh/channels.c +++ b/usr.bin/ssh/channels.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.89 2001/02/04 15:32:23 stevesk Exp $"); +RCSID("$OpenBSD: channels.c,v 1.90 2001/02/08 21:58:28 markus Exp $"); #include <openssl/rsa.h> #include <openssl/dsa.h> @@ -2170,7 +2170,7 @@ x11_request_forwarding_with_spoofing(int client_session_id, const char *proto, const char *data) { u_int data_len = (u_int) strlen(data) / 2; - u_int i, value; + u_int i, value, len; char *new_data; int screen_number; const char *cp; @@ -2208,9 +2208,11 @@ x11_request_forwarding_with_spoofing(int client_session_id, x11_fake_data_len = data_len; /* Convert the fake data into hex. */ - new_data = xmalloc(2 * data_len + 1); + len = 2 * data_len + 1; + new_data = xmalloc(len); for (i = 0; i < data_len; i++) - sprintf(new_data + 2 * i, "%02x", (u_char) x11_fake_data[i]); + snprintf(new_data + 2 * i, len - 2 * i, + "%02x", (u_char) x11_fake_data[i]); /* Send the request packet. */ if (compat20) { |