generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-28 19:51:58 +01:00
Code Issues Projects Releases Wiki Activity

NetSSL_Win: fix potential endless loop due to wrong error handling

Browse Source
This commit is contained in:
Günter Obiltschnig
2020-03-13 09:33:08 +01:00
parent 1d16cb115b
commit 5a5e8584f9
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
NetSSL_Win/src/SecureSocketImpl.cpp
View File

@@ -552,10 +552,10 @@ SECURITY_STATUS SecureSocketImpl::decodeMessage(BYTE* pBuffer, DWORD bufSize, Au
{ {
for (int i = 1; i < 4; ++i) for (int i = 1; i < 4; ++i)
{ {
if (pDataBuffer == 0 && msg[i].BufferType == SECBUFFER_DATA) if (!pDataBuffer && msg[i].BufferType == SECBUFFER_DATA)
pDataBuffer = &msg[i]; pDataBuffer = &msg[i];
if (pExtraBuffer == NULL && msg[i].BufferType == SECBUFFER_EXTRA) if (!pExtraBuffer && msg[i].BufferType == SECBUFFER_EXTRA)
pExtraBuffer = &msg[i]; pExtraBuffer = &msg[i];
} }
} }
@@ -631,16 +631,16 @@ SECURITY_STATUS SecureSocketImpl::decodeBufferFull(BYTE* pBuffer, DWORD bufSize,
} }
else else
{ {
// everything decoded if (securityStatus == SEC_E_OK)
if (securityStatus != SEC_E_OK && securityStatus != SEC_E_INCOMPLETE_MESSAGE && securityStatus != SEC_I_RENEGOTIATE && securityStatus != SEC_I_CONTEXT_EXPIRED)
{
throw SSLException("Failed to decode data", Utility::formatError(securityStatus));
}
else if (securityStatus == SEC_E_OK)
{ {
// everything decoded
pBuffer = 0; pBuffer = 0;
bufSize = 0; bufSize = 0;
} }
else if (securityStatus != SEC_E_INCOMPLETE_MESSAGE && securityStatus != SEC_I_RENEGOTIATE && securityStatus != SEC_I_CONTEXT_EXPIRED)
{
return securityStatus;
}
} }
if (securityStatus == SEC_I_RENEGOTIATE) if (securityStatus == SEC_I_RENEGOTIATE)