nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Initialise 'psa' to NULL on every code path in the Pageant client

Browse Source 
code, fixing a potential segfault when compiling with -DNO_SECURITY.

[originally from svn r9954]
This commit is contained in:
Simon Tatham 2013-07-21 11:01:22 +00:00
parent eaea69ef53
commit da052d88f8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
windows/winpgntc.c
View File

@ -173,6 +173,7 @@ int agent_query(void *in, int inlen, void **out, int *outlen,
return 1; /* *out == NULL, so failure */ return 1; /* *out == NULL, so failure */
mapname = dupprintf("PageantRequest%08x", (unsigned)GetCurrentThreadId()); mapname = dupprintf("PageantRequest%08x", (unsigned)GetCurrentThreadId());
psa = NULL;
#ifndef NO_SECURITY #ifndef NO_SECURITY
if (advapi_initialised || init_advapi()) { if (advapi_initialised || init_advapi()) {
/* /*
@ -186,7 +187,6 @@ int agent_query(void *in, int inlen, void **out, int *outlen,
*/ */
usersid = get_user_sid(); usersid = get_user_sid();
psa = NULL;
if (usersid) { if (usersid) {
psd = (PSECURITY_DESCRIPTOR) psd = (PSECURITY_DESCRIPTOR)
LocalAlloc(LPTR, SECURITY_DESCRIPTOR_MIN_LENGTH); LocalAlloc(LPTR, SECURITY_DESCRIPTOR_MIN_LENGTH);