summaryrefslogtreecommitdiff
path: root/misc.c
diff options
context:
space:
mode:
Diffstat (limited to 'misc.c')
-rw-r--r--misc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/misc.c b/misc.c
index 77f4a37a1..4aa5fdc8b 100644
--- a/misc.c
+++ b/misc.c
@@ -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 }