diff options
| author | RichardHitt <rbh00@netcom.com> | 2013-01-10 02:14:02 -0800 |
|---|---|---|
| committer | RichardHitt <rbh00@netcom.com> | 2013-01-10 02:14:02 -0800 |
| commit | bf673072e8457b60a5a8c8d0adf53fa3ccb71ea6 (patch) | |
| tree | 4a4d78d292998d449f04237c779d6d90e38b44ec /src/common/outbound.c | |
| parent | efdfa50f1e711e5bdd3ec98a3dedea422b3da362 (diff) | |
| parent | 475eb9fcaab1d846a3617f587f22bd77cdeddd5e (diff) | |
Merge branch 'master' into pull350
Diffstat (limited to 'src/common/outbound.c')
| -rw-r--r-- | src/common/outbound.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/common/outbound.c b/src/common/outbound.c index a8a65d6a..8241d78f 100644 --- a/src/common/outbound.c +++ b/src/common/outbound.c @@ -1866,7 +1866,6 @@ cmd_exec (struct session *sess, char *tbuf, char *word[], char *word_eol[]) /* not reached unless error */ /*printf("exec error\n");*/ fflush (stdout); - fflush (stdin); _exit (0); } if (pid == -1) @@ -1876,6 +1875,7 @@ cmd_exec (struct session *sess, char *tbuf, char *word[], char *word_eol[]) PrintText (sess, "Error in fork(2)\n"); close(fds[0]); close(fds[1]); + free (s); } else { /* Parent path */ @@ -3350,6 +3350,8 @@ static void url_join_only (server *serv, char *tbuf, char *channel) { /* already connected, JOIN only. FIXME: support keys? */ + if (channel == NULL) + return; tbuf[0] = '#'; /* tbuf is 4kb */ safe_strcpy ((tbuf + 1), channel, 256); |