tech
/
engine
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix double-free crash on TLS failure. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5709 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2020-06-27 19:31:48 +00:00
parent dfc44e5d36
commit 08f8cb2d35
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/common/net_ssl_gnutls.c
View File

@ -1185,10 +1185,8 @@ vfsfile_t *GNUTLS_OpenVFS(const char *hostname, vfsfile_t *source, qboolean isse
newf = Z_Malloc(sizeof(*newf));
if (!newf)
{
VFS_CLOSE(source);
return NULL;
}
newf->stream = source;
newf->funcs.Close = SSL_CloseFile;
newf->funcs.Flush = NULL;
newf->funcs.GetLen = SSL_GetLen;
@ -1208,6 +1206,7 @@ vfsfile_t *GNUTLS_OpenVFS(const char *hostname, vfsfile_t *source, qboolean isse
VFS_CLOSE(&newf->funcs);
return NULL;
}
newf->stream = source;
return &newf->funcs;
}

8
engine/common/net_ssl_winsspi.c
View File

@ -988,11 +988,7 @@ vfsfile_t *SSPI_OpenVFS(const char *servername, vfsfile_t *source, qboolean serv
const char *peername;
if (!source || !SSL_Inited())
{
if (source)
VFS_CLOSE(source);
return NULL;
}
if (server)
{
// localname = servername;
@ -1006,10 +1002,7 @@ vfsfile_t *SSPI_OpenVFS(const char *servername, vfsfile_t *source, qboolean serv
/*
if (server) //unsupported
{
VFS_CLOSE(source);
return NULL;
}
*/
newf = Z_Malloc(sizeof(*newf));
@ -1025,7 +1018,6 @@ vfsfile_t *SSPI_OpenVFS(const char *servername, vfsfile_t *source, qboolean serv
if (err)
{
Z_Free(newf);
VFS_CLOSE(source);
return NULL;
}
}