mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5869 from llyzs/winmm_fixes

Browse Source 
rdpsnd/winmm: fix some memory issues.
This commit is contained in:
Martin Fleisz 2020-02-10 10:40:55 +01:00 committed by GitHub
commit 1366abfbff
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
channels/rdpsnd/client/rdpsnd_main.c
View File

@ -478,9 +478,7 @@ static UINT rdpsnd_treat_wave(rdpsndPlugin* rdpsnd, wStream* s, size_t size)
end = GetTickCount64(); end = GetTickCount64();
diffMS = end - rdpsnd->wArrivalTime + latency; diffMS = end - rdpsnd->wArrivalTime + latency;
ts = rdpsnd->wTimeStamp + diffMS; ts = (rdpsnd->wTimeStamp + diffMS) % UINT16_MAX;
if (ts > UINT16_MAX)
ts = UINT16_MAX;
return rdpsnd_send_wave_confirm_pdu(rdpsnd, (UINT16)ts, rdpsnd->cBlockNo); return rdpsnd_send_wave_confirm_pdu(rdpsnd, (UINT16)ts, rdpsnd->cBlockNo);
} }
@ -741,7 +739,7 @@ static UINT rdpsnd_process_addin_args(rdpsndPlugin* rdpsnd, ADDIN_ARGV* args)
if ((errno != 0) || (val > UINT16_MAX)) if ((errno != 0) || (val > UINT16_MAX))
return CHANNEL_RC_INITIALIZATION_ERROR; return CHANNEL_RC_INITIALIZATION_ERROR;
rdpsnd->fixed_format->wFormatTag = val; rdpsnd->fixed_format->wFormatTag = (UINT16)val;
} }
CommandLineSwitchCase(arg, "rate") CommandLineSwitchCase(arg, "rate")
{ {
@ -759,7 +757,7 @@ static UINT rdpsnd_process_addin_args(rdpsndPlugin* rdpsnd, ADDIN_ARGV* args)
if ((errno != 0) || (val > UINT16_MAX)) if ((errno != 0) || (val > UINT16_MAX))
return CHANNEL_RC_INITIALIZATION_ERROR; return CHANNEL_RC_INITIALIZATION_ERROR;
rdpsnd->fixed_format->nChannels = val; rdpsnd->fixed_format->nChannels = (UINT16)val;
} }
CommandLineSwitchCase(arg, "latency") CommandLineSwitchCase(arg, "latency")
{ {

4
channels/rdpsnd/client/winmm/rdpsnd_winmm.c
View File

@ -184,7 +184,7 @@ static void rdpsnd_winmm_close(rdpsndDevicePlugin* device)
if (winmm->hThread) if (winmm->hThread)
{ {
WaitForSingleObject(winmm->hThread, INFINITE); WaitForSingleObject(winmm->hThread, INFINITE);
CloseHandle(&winmm->hThread); CloseHandle(winmm->hThread);
winmm->hThread = NULL; winmm->hThread = NULL;
} }
} }
@ -266,7 +266,7 @@ static UINT rdpsnd_winmm_play(rdpsndDevicePlugin* device, const BYTE* data, size
if (size > UINT32_MAX) if (size > UINT32_MAX)
return 0; return 0;
lpWaveHdr = malloc(sizeof(WAVEHDR)); lpWaveHdr = (LPWAVEHDR)calloc(1, sizeof(WAVEHDR));
if (!lpWaveHdr) if (!lpWaveHdr)
return 0; return 0;