diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | channels.c | 4 | ||||
-rw-r--r-- | clientloop.c | 8 |
3 files changed, 10 insertions, 7 deletions
@@ -36,6 +36,9 @@ | |||
36 | - stevesk@cvs.openbsd.org 2005/10/14 02:17:59 | 36 | - stevesk@cvs.openbsd.org 2005/10/14 02:17:59 |
37 | [ssh-keygen.c ssh.c sshconnect2.c] | 37 | [ssh-keygen.c ssh.c sshconnect2.c] |
38 | no trailing "\n" for log functions; ok djm@ | 38 | no trailing "\n" for log functions; ok djm@ |
39 | - stevesk@cvs.openbsd.org 2005/10/14 02:29:37 | ||
40 | [channels.c clientloop.c] | ||
41 | free()->xfree(); ok djm@ | ||
39 | 42 | ||
40 | 20051102 | 43 | 20051102 |
41 | - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). | 44 | - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). |
@@ -3169,4 +3172,4 @@ | |||
3169 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3172 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3170 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3173 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3171 | 3174 | ||
3172 | $Id: ChangeLog,v 1.3935 2005/11/05 04:07:33 djm Exp $ | 3175 | $Id: ChangeLog,v 1.3936 2005/11/05 04:07:59 djm Exp $ |
diff --git a/channels.c b/channels.c index 175b59e44..9607717cc 100644 --- a/channels.c +++ b/channels.c | |||
@@ -39,7 +39,7 @@ | |||
39 | */ | 39 | */ |
40 | 40 | ||
41 | #include "includes.h" | 41 | #include "includes.h" |
42 | RCSID("$OpenBSD: channels.c,v 1.226 2005/10/11 23:37:37 djm Exp $"); | 42 | RCSID("$OpenBSD: channels.c,v 1.227 2005/10/14 02:29:37 stevesk Exp $"); |
43 | 43 | ||
44 | #include "ssh.h" | 44 | #include "ssh.h" |
45 | #include "ssh1.h" | 45 | #include "ssh1.h" |
@@ -2464,7 +2464,7 @@ channel_request_rforward_cancel(const char *host, u_short port) | |||
2464 | 2464 | ||
2465 | permitted_opens[i].listen_port = 0; | 2465 | permitted_opens[i].listen_port = 0; |
2466 | permitted_opens[i].port_to_connect = 0; | 2466 | permitted_opens[i].port_to_connect = 0; |
2467 | free(permitted_opens[i].host_to_connect); | 2467 | xfree(permitted_opens[i].host_to_connect); |
2468 | permitted_opens[i].host_to_connect = NULL; | 2468 | permitted_opens[i].host_to_connect = NULL; |
2469 | } | 2469 | } |
2470 | 2470 | ||
diff --git a/clientloop.c b/clientloop.c index fed684956..b267fa142 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -59,7 +59,7 @@ | |||
59 | */ | 59 | */ |
60 | 60 | ||
61 | #include "includes.h" | 61 | #include "includes.h" |
62 | RCSID("$OpenBSD: clientloop.c,v 1.143 2005/10/10 10:23:08 djm Exp $"); | 62 | RCSID("$OpenBSD: clientloop.c,v 1.144 2005/10/14 02:29:37 stevesk Exp $"); |
63 | 63 | ||
64 | #include "ssh.h" | 64 | #include "ssh.h" |
65 | #include "ssh1.h" | 65 | #include "ssh1.h" |
@@ -1880,7 +1880,7 @@ client_session2_setup(int id, int want_tty, int want_subsystem, | |||
1880 | /* Split */ | 1880 | /* Split */ |
1881 | name = xstrdup(env[i]); | 1881 | name = xstrdup(env[i]); |
1882 | if ((val = strchr(name, '=')) == NULL) { | 1882 | if ((val = strchr(name, '=')) == NULL) { |
1883 | free(name); | 1883 | xfree(name); |
1884 | continue; | 1884 | continue; |
1885 | } | 1885 | } |
1886 | *val++ = '\0'; | 1886 | *val++ = '\0'; |
@@ -1894,7 +1894,7 @@ client_session2_setup(int id, int want_tty, int want_subsystem, | |||
1894 | } | 1894 | } |
1895 | if (!matched) { | 1895 | if (!matched) { |
1896 | debug3("Ignored env %s", name); | 1896 | debug3("Ignored env %s", name); |
1897 | free(name); | 1897 | xfree(name); |
1898 | continue; | 1898 | continue; |
1899 | } | 1899 | } |
1900 | 1900 | ||
@@ -1903,7 +1903,7 @@ client_session2_setup(int id, int want_tty, int want_subsystem, | |||
1903 | packet_put_cstring(name); | 1903 | packet_put_cstring(name); |
1904 | packet_put_cstring(val); | 1904 | packet_put_cstring(val); |
1905 | packet_send(); | 1905 | packet_send(); |
1906 | free(name); | 1906 | xfree(name); |
1907 | } | 1907 | } |
1908 | } | 1908 | } |
1909 | 1909 | ||