tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- stevesk@cvs.openbsd.org 2005/10/14 02:29:37 

[channels.c clientloop.c]
     free()->xfree(); ok djm@
This commit is contained in:
Damien Miller 2005-11-05 15:07:59 +11:00
parent 15d72a00a3
commit 0a0176e9f3
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -36,6 +36,9 @@
- stevesk@cvs.openbsd.org 2005/10/14 02:17:59 - stevesk@cvs.openbsd.org 2005/10/14 02:17:59
[ssh-keygen.c ssh.c sshconnect2.c] [ssh-keygen.c ssh.c sshconnect2.c]
no trailing "\n" for log functions; ok djm@ no trailing "\n" for log functions; ok djm@
- stevesk@cvs.openbsd.org 2005/10/14 02:29:37
[channels.c clientloop.c]
free()->xfree(); ok djm@
20051102 20051102
- (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup().
@ -3169,4 +3172,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3935 2005/11/05 04:07:33 djm Exp $ $Id: ChangeLog,v 1.3936 2005/11/05 04:07:59 djm Exp $

4
channels.c
View File

@ -39,7 +39,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: channels.c,v 1.226 2005/10/11 23:37:37 djm Exp $"); RCSID("$OpenBSD: channels.c,v 1.227 2005/10/14 02:29:37 stevesk Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -2464,7 +2464,7 @@ channel_request_rforward_cancel(const char *host, u_short port)
permitted_opens[i].listen_port = 0; permitted_opens[i].listen_port = 0;
permitted_opens[i].port_to_connect = 0; permitted_opens[i].port_to_connect = 0;
free(permitted_opens[i].host_to_connect); xfree(permitted_opens[i].host_to_connect);
permitted_opens[i].host_to_connect = NULL; permitted_opens[i].host_to_connect = NULL;
} }

8
clientloop.c
View File

@ -59,7 +59,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: clientloop.c,v 1.143 2005/10/10 10:23:08 djm Exp $"); RCSID("$OpenBSD: clientloop.c,v 1.144 2005/10/14 02:29:37 stevesk Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -1880,7 +1880,7 @@ client_session2_setup(int id, int want_tty, int want_subsystem,
/* Split */ /* Split */
name = xstrdup(env[i]); name = xstrdup(env[i]);
if ((val = strchr(name, '=')) == NULL) { if ((val = strchr(name, '=')) == NULL) {
free(name); xfree(name);
continue; continue;
} }
*val++ = '\0'; *val++ = '\0';
@ -1894,7 +1894,7 @@ client_session2_setup(int id, int want_tty, int want_subsystem,
} }
if (!matched) { if (!matched) {
debug3("Ignored env %s", name); debug3("Ignored env %s", name);
free(name); xfree(name);
continue; continue;
} }
@ -1903,7 +1903,7 @@ client_session2_setup(int id, int want_tty, int want_subsystem,
packet_put_cstring(name); packet_put_cstring(name);
packet_put_cstring(val); packet_put_cstring(val);
packet_send(); packet_send();
free(name); xfree(name);
} }
} }