From b8638f2c468738fd771e9f924bdff73d27b4a3ca Mon Sep 17 00:00:00 2001 From: David Reid Date: Sun, 18 Mar 2018 07:50:58 +1000 Subject: [PATCH] Use mal_strncpy_s() instead of mal_strcpy_s() in a few places. --- mini_al.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mini_al.h b/mini_al.h index 14ad6c65..71791994 100644 --- a/mini_al.h +++ b/mini_al.h @@ -4380,7 +4380,7 @@ mal_result mal_context_enumerate_devices__wasapi(mal_context* pContext, mal_enum if (cbResult) { mal_device_info deviceInfo; mal_zero_object(&deviceInfo); - mal_strcpy_s(deviceInfo.name, sizeof(deviceInfo.name), MAL_DEFAULT_PLAYBACK_DEVICE_NAME); + mal_strncpy_s(deviceInfo.name, sizeof(deviceInfo.name), MAL_DEFAULT_PLAYBACK_DEVICE_NAME, (size_t)-1); cbResult = callback(pContext, mal_device_type_playback, &deviceInfo, pUserData); } @@ -4388,7 +4388,7 @@ mal_result mal_context_enumerate_devices__wasapi(mal_context* pContext, mal_enum if (cbResult) { mal_device_info deviceInfo; mal_zero_object(&deviceInfo); - mal_strcpy_s(deviceInfo.name, sizeof(deviceInfo.name), MAL_DEFAULT_CAPTURE_DEVICE_NAME); + mal_strncpy_s(deviceInfo.name, sizeof(deviceInfo.name), MAL_DEFAULT_CAPTURE_DEVICE_NAME, (size_t)-1); cbResult = callback(pContext, mal_device_type_capture, &deviceInfo, pUserData); } } @@ -5677,9 +5677,9 @@ mal_result mal_context_get_device_info__dsound(mal_context* pContext, mal_device // Name / Description/ if (deviceType == mal_device_type_playback) { - mal_strcpy_s(pDeviceInfo->name, sizeof(pDeviceInfo->name), MAL_DEFAULT_PLAYBACK_DEVICE_NAME); + mal_strncpy_s(pDeviceInfo->name, sizeof(pDeviceInfo->name), MAL_DEFAULT_PLAYBACK_DEVICE_NAME, (size_t)-1); } else { - mal_strcpy_s(pDeviceInfo->name, sizeof(pDeviceInfo->name), MAL_DEFAULT_CAPTURE_DEVICE_NAME); + mal_strncpy_s(pDeviceInfo->name, sizeof(pDeviceInfo->name), MAL_DEFAULT_CAPTURE_DEVICE_NAME, (size_t)-1); } } @@ -10890,7 +10890,7 @@ mal_result mal_context_enumerate_devices__jack(mal_context* pContext, mal_enum_d if (cbResult) { mal_device_info deviceInfo; mal_zero_object(&deviceInfo); - mal_strcpy_s(deviceInfo.name, sizeof(deviceInfo.name), MAL_DEFAULT_PLAYBACK_DEVICE_NAME); + mal_strncpy_s(deviceInfo.name, sizeof(deviceInfo.name), MAL_DEFAULT_PLAYBACK_DEVICE_NAME, (size_t)-1); cbResult = callback(pContext, mal_device_type_playback, &deviceInfo, pUserData); } @@ -10898,7 +10898,7 @@ mal_result mal_context_enumerate_devices__jack(mal_context* pContext, mal_enum_d if (cbResult) { mal_device_info deviceInfo; mal_zero_object(&deviceInfo); - mal_strcpy_s(deviceInfo.name, sizeof(deviceInfo.name), MAL_DEFAULT_CAPTURE_DEVICE_NAME); + mal_strncpy_s(deviceInfo.name, sizeof(deviceInfo.name), MAL_DEFAULT_CAPTURE_DEVICE_NAME, (size_t)-1); cbResult = callback(pContext, mal_device_type_capture, &deviceInfo, pUserData); } @@ -10916,9 +10916,9 @@ mal_result mal_context_get_device_info__jack(mal_context* pContext, mal_device_t // Name / Description if (deviceType == mal_device_type_playback) { - mal_strcpy_s(pDeviceInfo->name, sizeof(pDeviceInfo->name), MAL_DEFAULT_PLAYBACK_DEVICE_NAME); + mal_strncpy_s(pDeviceInfo->name, sizeof(pDeviceInfo->name), MAL_DEFAULT_PLAYBACK_DEVICE_NAME, (size_t)-1); } else { - mal_strcpy_s(pDeviceInfo->name, sizeof(pDeviceInfo->name), MAL_DEFAULT_CAPTURE_DEVICE_NAME); + mal_strncpy_s(pDeviceInfo->name, sizeof(pDeviceInfo->name), MAL_DEFAULT_CAPTURE_DEVICE_NAME, (size_t)-1); } return MAL_SUCCESS; @@ -14548,9 +14548,9 @@ mal_result mal_context_get_device_info(mal_context* pContext, mal_device_type ty // It's asking for the default device. We don't have a way to retrieve advanced info so we just stick // with the name. if (type == mal_device_type_playback) { - mal_strcpy_s(pDeviceInfo->name, sizeof(pDeviceInfo->name), MAL_DEFAULT_PLAYBACK_DEVICE_NAME); + mal_strncpy_s(pDeviceInfo->name, sizeof(pDeviceInfo->name), MAL_DEFAULT_PLAYBACK_DEVICE_NAME, (size_t)-1); } else { - mal_strcpy_s(pDeviceInfo->name, sizeof(pDeviceInfo->name), MAL_DEFAULT_CAPTURE_DEVICE_NAME); + mal_strncpy_s(pDeviceInfo->name, sizeof(pDeviceInfo->name), MAL_DEFAULT_CAPTURE_DEVICE_NAME, (size_t)-1); } return MAL_SUCCESS;