morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12157 from akallabeth/info-fix

Browse Source 
[core,info] fix missing NULL check
This commit is contained in:
akallabeth
2026-01-19 21:00:02 +01:00
committed by GitHub
parent b0506e2ffa 4d44e3c097
commit 72a967aaea
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libfreerdp/core/info.c
View File

@@ -1447,7 +1447,7 @@ static BOOL rdp_write_logon_info_v1(wStream* s, logon_info* info)
return TRUE;
}
static BOOL rdp_write_logon_info_v2(wStream* s, logon_info* info)
static BOOL rdp_write_logon_info_v2(wStream* s, const logon_info* info)
{
size_t domainLen = 0;
size_t usernameLen = 0;
@@ -1462,11 +1462,14 @@ static BOOL rdp_write_logon_info_v2(wStream* s, logon_info* info)
*/
Stream_Write_UINT32(s, logonInfoV2Size);
Stream_Write_UINT32(s, info->sessionId);
domainLen = strnlen(info->domain, 256); /* lmcons.h UNLEN */
if (info->domain)
domainLen = strnlen(info->domain, 256); /* lmcons.h UNLEN */
if (domainLen >= UINT32_MAX / sizeof(WCHAR))
return FALSE;
Stream_Write_UINT32(s, (UINT32)(domainLen + 1) * sizeof(WCHAR));
usernameLen = strnlen(info->username, 256); /* lmcons.h UNLEN */
if (info->username)
usernameLen = strnlen(info->username, 256); /* lmcons.h UNLEN */
if (usernameLen >= UINT32_MAX / sizeof(WCHAR))
return FALSE;
Stream_Write_UINT32(s, (UINT32)(usernameLen + 1) * sizeof(WCHAR));
@@ -1534,10 +1537,11 @@ static BOOL rdp_write_logon_info_ex(wStream* s, logon_info_ex* info)
BOOL rdp_send_save_session_info(rdpContext* context, UINT32 type, void* data)
{
UINT16 sec_flags = 0;
wStream* s = NULL;
BOOL status = 0;
WINPR_ASSERT(context);
rdpRdp* rdp = context->rdp;
s = rdp_data_pdu_init(rdp, &sec_flags);
wStream* s = rdp_data_pdu_init(rdp, &sec_flags);
if (!s)
return FALSE;