diff options
| author | mmcc <mmcc@cvs.openbsd.org> | 2015-10-20 03:36:36 +0000 |
|---|---|---|
| committer | mmcc <mmcc@cvs.openbsd.org> | 2015-10-20 03:36:36 +0000 |
| commit | f6260440e71680f1d3ad3ab523dd3fa698580918 (patch) | |
| tree | 84a69403cadc6cbd7366bb27674d745590160dd0 | |
| parent | eb8ac7a62bcf763450f4e522081c9dd6be5467fd (diff) | |
Replace a function-local allocation with stack memory.
ok djm@
| -rw-r--r-- | usr.bin/ssh/clientloop.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c index 4c561df1aca..000b80710c4 100644 --- a/usr.bin/ssh/clientloop.c +++ b/usr.bin/ssh/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.275 2015/07/10 06:21:53 markus Exp $ */ +/* $OpenBSD: clientloop.c,v 1.276 2015/10/20 03:36:35 mmcc Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -303,11 +303,10 @@ client_x11_get_proto(const char *display, const char *xauth_path, static char proto[512], data[512]; FILE *f; int got_data = 0, generated = 0, do_unlink = 0, i; - char *xauthdir, *xauthfile; + char xauthdir[PATH_MAX] = "", xauthfile[PATH_MAX] = ""; struct stat st; u_int now, x11_timeout_real; - xauthdir = xauthfile = NULL; *_proto = proto; *_data = data; proto[0] = data[0] = '\0'; @@ -335,8 +334,6 @@ client_x11_get_proto(const char *display, const char *xauth_path, display = xdisplay; } if (trusted == 0) { - xauthdir = xmalloc(PATH_MAX); - xauthfile = xmalloc(PATH_MAX); mktemp_proto(xauthdir, PATH_MAX); /* * The authentication cookie should briefly outlive @@ -399,8 +396,6 @@ client_x11_get_proto(const char *display, const char *xauth_path, unlink(xauthfile); rmdir(xauthdir); } - free(xauthdir); - free(xauthfile); /* * If we didn't get authentication data, just make up some |