tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

Replace a function-local allocation with stack memory.

ok djm@

Upstream-ID: c09fbbab637053a2ab9f33ca142b4e20a4c5a17e
This commit is contained in:
mmcc@openbsd.org 2015-10-20 03:36:35 +00:00 committed by Damien Miller
parent ac908c1eea
commit f98a09cacf
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clientloop.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -311,11 +311,10 @@ client_x11_get_proto(const char *display, const char *xauth_path,
static char proto[512], data[512]; static char proto[512], data[512];
FILE *f; FILE *f;
int got_data = 0, generated = 0, do_unlink = 0, i; int got_data = 0, generated = 0, do_unlink = 0, i;
char *xauthdir, *xauthfile; char xauthdir[PATH_MAX] = "", xauthfile[PATH_MAX] = "";
struct stat st; struct stat st;
u_int now, x11_timeout_real; u_int now, x11_timeout_real;
xauthdir = xauthfile = NULL;
*_proto = proto; *_proto = proto;
*_data = data; *_data = data;
proto[0] = data[0] = '\0'; proto[0] = data[0] = '\0';
@ -343,8 +342,6 @@ client_x11_get_proto(const char *display, const char *xauth_path,
display = xdisplay; display = xdisplay;
} }
if (trusted == 0) { if (trusted == 0) {
xauthdir = xmalloc(PATH_MAX);
xauthfile = xmalloc(PATH_MAX);
mktemp_proto(xauthdir, PATH_MAX); mktemp_proto(xauthdir, PATH_MAX);
/* /*
* The authentication cookie should briefly outlive * The authentication cookie should briefly outlive
@ -407,8 +404,6 @@ client_x11_get_proto(const char *display, const char *xauth_path,
unlink(xauthfile); unlink(xauthfile);
rmdir(xauthdir); rmdir(xauthdir);
} }
free(xauthdir);
free(xauthfile);
/* /*
* If we didn't get authentication data, just make up some * If we didn't get authentication data, just make up some