mirror/miniaudio
1
0
Fork 0
mirror of https://github.com/mackron/miniaudio.git synced 2026-04-24 01:04:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few bugs found through static analysis.

Browse Source
This commit is contained in:
David Reid
2018-03-11 07:50:05 +10:00
parent afb0029da0
commit b2b20ee149
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mini_al.h
+4 -4
View File
@@ -3237,7 +3237,7 @@ static mal_result mal_context__try_get_device_name_by_id(mal_context* pContext,
#ifdef MAL_HAS_WASAPI #ifdef MAL_HAS_WASAPI
case mal_backend_wasapi: case mal_backend_wasapi:
{ {
if (memcmp(pDeviceID->wasapi, &pInfos[iDevice].id.wasapi, sizeof(pDeviceID->wasapi)) == 0) { if (memcmp(pDeviceID->wasapi, pInfos[iDevice].id.wasapi, sizeof(pDeviceID->wasapi)) == 0) {
found = MAL_TRUE; found = MAL_TRUE;
} }
} break; } break;
@@ -3245,7 +3245,7 @@ static mal_result mal_context__try_get_device_name_by_id(mal_context* pContext,
#ifdef MAL_HAS_DSOUND #ifdef MAL_HAS_DSOUND
case mal_backend_dsound: case mal_backend_dsound:
{ {
if (memcmp(pDeviceID->dsound, &pInfos[iDevice].id.dsound, sizeof(pDeviceID->dsound)) == 0) { if (memcmp(pDeviceID->dsound, pInfos[iDevice].id.dsound, sizeof(pDeviceID->dsound)) == 0) {
found = MAL_TRUE; found = MAL_TRUE;
} }
} break; } break;
@@ -4103,7 +4103,7 @@ static mal_result mal_enumerate_devices__wasapi(mal_context* pContext, mal_devic
hr = IMMDevice_GetId(pDevice, &id); hr = IMMDevice_GetId(pDevice, &id);
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
size_t idlen = wcslen(id); size_t idlen = wcslen(id);
if (idlen+sizeof(wchar_t) > sizeof(pInfo->id.wasapi)) { if (idlen+1 > mal_countof(pInfo->id.wasapi)) {
mal_CoTaskMemFree(pContext, id); mal_CoTaskMemFree(pContext, id);
mal_assert(MAL_FALSE); // NOTE: If this is triggered, please report it. It means the format of the ID must haved change and is too long to fit in our fixed sized buffer. mal_assert(MAL_FALSE); // NOTE: If this is triggered, please report it. It means the format of the ID must haved change and is too long to fit in our fixed sized buffer.
continue; continue;
@@ -14542,7 +14542,7 @@ mal_dsp_config mal_dsp_config_init_ex(mal_format formatIn, mal_uint32 channelsIn
mal_copy_memory(config.channelMapIn, channelMapIn, sizeof(config.channelMapIn)); mal_copy_memory(config.channelMapIn, channelMapIn, sizeof(config.channelMapIn));
} }
if (channelMapOut != NULL) { if (channelMapOut != NULL) {
mal_copy_memory(config.channelMapIn, channelMapIn, sizeof(config.channelMapIn)); mal_copy_memory(config.channelMapOut, channelMapOut, sizeof(config.channelMapOut));
} }
return config; return config;