mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[core,nla] nla_read_TSRemoteGuardPackageCred 

* fix maybe uninitialized arguments
* fix return in case of invalid packet
This commit is contained in:
akallabeth 2024-09-14 20:35:28 +02:00
parent 3460f64f57
commit 9cfd748b63
No known key found for this signature in database
GPG Key ID: A49454A3FC909FD5
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libfreerdp/core/nla.c
View File

@ -1198,6 +1198,7 @@ static BOOL nla_read_KERB_TICKET_LOGON(rdpNla* nla, wStream* s, KERB_TICKET_LOGO
/** @brief kind of RCG credentials */ /** @brief kind of RCG credentials */
typedef enum typedef enum
{ {
RCG_TYPE_NONE,
RCG_TYPE_KERB, RCG_TYPE_KERB,
RCG_TYPE_NTLM RCG_TYPE_NTLM
} RemoteGuardPackageCredType; } RemoteGuardPackageCredType;
@ -1211,17 +1212,24 @@ static BOOL nla_read_TSRemoteGuardPackageCred(rdpNla* nla, WinPrAsn1Decoder* dec
BOOL error = FALSE; BOOL error = FALSE;
char packageNameStr[100] = { 0 }; char packageNameStr[100] = { 0 };
WINPR_ASSERT(nla);
WINPR_ASSERT(dec);
WINPR_ASSERT(credsType);
WINPR_ASSERT(payload);
*credsType = RCG_TYPE_NONE;
/* packageName [0] OCTET STRING */ /* packageName [0] OCTET STRING */
if (!WinPrAsn1DecReadContextualOctetString(dec, 0, &error, &packageName, FALSE) || error) if (!WinPrAsn1DecReadContextualOctetString(dec, 0, &error, &packageName, FALSE) || error)
return TRUE; return FALSE;
ConvertMszWCharNToUtf8((WCHAR*)packageName.data, packageName.len / sizeof(WCHAR), ConvertMszWCharNToUtf8((WCHAR*)packageName.data, packageName.len / sizeof(WCHAR),
packageNameStr, 100); packageNameStr, sizeof(packageNameStr));
WLog_DBG(TAG, "TSRemoteGuardPackageCred(%s)", packageNameStr); WLog_DBG(TAG, "TSRemoteGuardPackageCred(%s)", packageNameStr);
/* credBuffer [1] OCTET STRING, */ /* credBuffer [1] OCTET STRING, */
if (!WinPrAsn1DecReadContextualOctetString(dec, 1, &error, &credBuffer, FALSE) || error) if (!WinPrAsn1DecReadContextualOctetString(dec, 1, &error, &credBuffer, FALSE) || error)
return TRUE; return FALSE;
if (_stricmp(packageNameStr, "Kerberos") == 0) if (_stricmp(packageNameStr, "Kerberos") == 0)
{ {
@ -1345,7 +1353,7 @@ static BOOL nla_read_ts_credentials(rdpNla* nla, SecBuffer* data)
if (!WinPrAsn1DecReadContextualSequence(&dec2, 0, &error, &logonCredsSeq) || error) if (!WinPrAsn1DecReadContextualSequence(&dec2, 0, &error, &logonCredsSeq) || error)
return FALSE; return FALSE;
RemoteGuardPackageCredType logonCredsType = { 0 }; RemoteGuardPackageCredType logonCredsType = RCG_TYPE_NONE;
wStream logonPayload = { 0 }; wStream logonPayload = { 0 };
if (!nla_read_TSRemoteGuardPackageCred(nla, &logonCredsSeq, &logonCredsType, if (!nla_read_TSRemoteGuardPackageCred(nla, &logonCredsSeq, &logonCredsType,
&logonPayload)) &logonPayload))