diff options
author | Matt Johnston <matt@ucc.asn.au> | 2007-02-03 08:22:58 +0000 |
---|---|---|
committer | Matt Johnston <matt@ucc.asn.au> | 2007-02-03 08:22:58 +0000 |
commit | 8c5b6c7caa336f4b3abd0ca76ce99477e4c889ff (patch) | |
tree | 02c77629a4c54162320fe173a98b02359144f168 /svr-chansession.c | |
parent | 5f9194a225c43ad5898819a9a5de77dc19ef4ad8 (diff) | |
parent | 2dd47260acfa403fc2c7e509ffd83e3dd11a2eaf (diff) | |
download | dropbear-8c5b6c7caa336f4b3abd0ca76ce99477e4c889ff.tar.gz |
propagate from branch 'au.asn.ucc.matt.dropbear' (head b1dd3b94e60a07a176dba2b035ac79968595990a)
to branch 'au.asn.ucc.matt.dropbear.channel-fix' (head fc77c3dea87a7c0f374e738d055f0b455495cbc3)
Diffstat (limited to 'svr-chansession.c')
-rw-r--r-- | svr-chansession.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/svr-chansession.c b/svr-chansession.c index 99a67e9..a45e7a6 100644 --- a/svr-chansession.c +++ b/svr-chansession.c @@ -101,7 +101,7 @@ static void sesssigchild_handler(int UNUSED(dummy)) { /* If the pid wasn't matched, then we might have hit the race mentioned * above. So we just store the info for the parent to deal with */ - if (!exit) { + if (exit == NULL) { exit = &svr_ses.lastexit; } @@ -1007,6 +1007,7 @@ void addnewvar(const char* param, const char* var) { newvar[plen] = '='; memcpy(&newvar[plen+1], var, vlen); newvar[plen+vlen+1] = '\0'; + /* newvar is leaked here, but that's part of putenv()'s semantics */ if (putenv(newvar) < 0) { dropbear_exit("environ error"); } |