diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-06-02 07:31:17 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-06-02 07:31:17 +1000 |
commit | a627d42e51ffa71e014d7b2d2c07118122fd3ec3 (patch) | |
tree | 7bda769de81f509e28d800916fa20abd37906d79 /misc.c | |
parent | c7aad0058c957afeb26a3f703e8cb0eddeb62365 (diff) |
- djm@cvs.openbsd.org 2013/05/17 00:13:13
[xmalloc.h cipher.c sftp-glob.c ssh-keyscan.c ssh.c sftp-common.c
ssh-ecdsa.c auth2-chall.c compat.c readconf.c kexgexs.c monitor.c
gss-genr.c cipher-3des1.c kex.c monitor_wrap.c ssh-pkcs11-client.c
auth-options.c rsa.c auth2-pubkey.c sftp.c hostfile.c auth2.c
servconf.c auth.c authfile.c xmalloc.c uuencode.c sftp-client.c
auth2-gss.c sftp-server.c bufaux.c mac.c session.c jpake.c kexgexc.c
sshconnect.c auth-chall.c auth2-passwd.c sshconnect1.c buffer.c
kexecdhs.c kexdhs.c ssh-rsa.c auth1.c ssh-pkcs11.c auth2-kbdint.c
kexdhc.c sshd.c umac.c ssh-dss.c auth2-jpake.c bufbn.c clientloop.c
monitor_mm.c scp.c roaming_client.c serverloop.c key.c auth-rsa.c
ssh-pkcs11-helper.c ssh-keysign.c ssh-keygen.c match.c channels.c
sshconnect2.c addrmatch.c mux.c canohost.c kexecdhc.c schnorr.c
ssh-add.c misc.c auth2-hostbased.c ssh-agent.c bufec.c groupaccess.c
dns.c packet.c readpass.c authfd.c moduli.c]
bye, bye xfree(); ok markus@
Diffstat (limited to 'misc.c')
-rw-r--r-- | misc.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: misc.c,v 1.88 2013/04/24 16:01:46 tedu Exp $ */ | 1 | /* $OpenBSD: misc.c,v 1.89 2013/05/17 00:13:13 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2005,2006 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2005,2006 Damien Miller. All rights reserved. |
@@ -253,13 +253,13 @@ a2tun(const char *s, int *remote) | |||
253 | *remote = SSH_TUNID_ANY; | 253 | *remote = SSH_TUNID_ANY; |
254 | sp = xstrdup(s); | 254 | sp = xstrdup(s); |
255 | if ((ep = strchr(sp, ':')) == NULL) { | 255 | if ((ep = strchr(sp, ':')) == NULL) { |
256 | xfree(sp); | 256 | free(sp); |
257 | return (a2tun(s, NULL)); | 257 | return (a2tun(s, NULL)); |
258 | } | 258 | } |
259 | ep[0] = '\0'; ep++; | 259 | ep[0] = '\0'; ep++; |
260 | *remote = a2tun(ep, NULL); | 260 | *remote = a2tun(ep, NULL); |
261 | tun = a2tun(sp, NULL); | 261 | tun = a2tun(sp, NULL); |
262 | xfree(sp); | 262 | free(sp); |
263 | return (*remote == SSH_TUNID_ERR ? *remote : tun); | 263 | return (*remote == SSH_TUNID_ERR ? *remote : tun); |
264 | } | 264 | } |
265 | 265 | ||
@@ -492,7 +492,7 @@ replacearg(arglist *args, u_int which, char *fmt, ...) | |||
492 | if (which >= args->num) | 492 | if (which >= args->num) |
493 | fatal("replacearg: tried to replace invalid arg %d >= %d", | 493 | fatal("replacearg: tried to replace invalid arg %d >= %d", |
494 | which, args->num); | 494 | which, args->num); |
495 | xfree(args->list[which]); | 495 | free(args->list[which]); |
496 | args->list[which] = cp; | 496 | args->list[which] = cp; |
497 | } | 497 | } |
498 | 498 | ||
@@ -503,8 +503,8 @@ freeargs(arglist *args) | |||
503 | 503 | ||
504 | if (args->list != NULL) { | 504 | if (args->list != NULL) { |
505 | for (i = 0; i < args->num; i++) | 505 | for (i = 0; i < args->num; i++) |
506 | xfree(args->list[i]); | 506 | free(args->list[i]); |
507 | xfree(args->list); | 507 | free(args->list); |
508 | args->nalloc = args->num = 0; | 508 | args->nalloc = args->num = 0; |
509 | args->list = NULL; | 509 | args->list = NULL; |
510 | } | 510 | } |