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

Attempt to fix an error with ma_log_postv().

Browse Source 
Public issue https://github.com/mackron/miniaudio/issues/980
This commit is contained in:
David Reid
2025-04-25 18:41:44 +10:00
parent a944e19331
commit 2ee920577e
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+13 -10
View File
@@ -13475,6 +13475,14 @@ static ma_result ma_allocation_callbacks_init_copy(ma_allocation_callbacks* pDst
Logging Logging
**************************************************************************************************************************************************************/ **************************************************************************************************************************************************************/
#ifndef ma_va_copy
#if !defined(_MSC_VER) || _MSC_VER >= 1800
#define ma_va_copy(dst, src) va_copy((dst), (src))
#else
#define ma_va_copy(dst, src) ((dst) = (src))
#endif
#endif
MA_API const char* ma_log_level_to_string(ma_uint32 logLevel) MA_API const char* ma_log_level_to_string(ma_uint32 logLevel)
{ {
switch (logLevel) switch (logLevel)
@@ -13715,9 +13723,12 @@ MA_API ma_result ma_log_postv(ma_log* pLog, ma_uint32 level, const char* pFormat
int length; int length;
char pFormattedMessageStack[1024]; char pFormattedMessageStack[1024];
char* pFormattedMessageHeap = NULL; char* pFormattedMessageHeap = NULL;
va_list args2;
ma_va_copy(args2, args);
/* First try formatting into our fixed sized stack allocated buffer. If this is too small we'll fallback to a heap allocation. */ /* First try formatting into our fixed sized stack allocated buffer. If this is too small we'll fallback to a heap allocation. */
length = vsnprintf(pFormattedMessageStack, sizeof(pFormattedMessageStack), pFormat, args); length = vsnprintf(pFormattedMessageStack, sizeof(pFormattedMessageStack), pFormat, args2);
if (length < 0) { if (length < 0) {
return MA_INVALID_OPERATION; /* An error occurred when trying to convert the buffer. */ return MA_INVALID_OPERATION; /* An error occurred when trying to convert the buffer. */
} }
@@ -13758,15 +13769,7 @@ MA_API ma_result ma_log_postv(ma_log* pLog, ma_uint32 level, const char* pFormat
char* pFormattedMessage = NULL; char* pFormattedMessage = NULL;
va_list args2; va_list args2;
#if _MSC_VER >= 1800 ma_va_copy(args2, args);
{
va_copy(args2, args);
}
#else
{
args2 = args;
}
#endif
formattedLen = ma_vscprintf(&pLog->allocationCallbacks, pFormat, args2); formattedLen = ma_vscprintf(&pLog->allocationCallbacks, pFormat, args2);
va_end(args2); va_end(args2);