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

Merge pull request #343 from Clownacy/dev

Browse Source 
Fix `ma_log_postv` not returning anything under certain circumstances
This commit is contained in:
David Reid
2021-07-14 17:18:14 +10:00
committed by GitHub
parent 7bb96d8a3c f56ea20470
commit 1161e47ec7
1 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+8 -6
View File
@@ -8789,11 +8789,17 @@ MA_API ma_result ma_log_postv(ma_log* pLog, ma_uint32 level, const char* pFormat
formattedLen = ma_vscprintf(&pLog->allocationCallbacks, pFormat, args2); formattedLen = ma_vscprintf(&pLog->allocationCallbacks, pFormat, args2);
va_end(args2); va_end(args2);
if (formattedLen > 0) { if (formattedLen <= 0) {
return MA_INVALID_OPERATION;
}
char* pFormattedMessage = NULL; char* pFormattedMessage = NULL;
pFormattedMessage = (char*)ma_malloc(formattedLen + 1, &pLog->allocationCallbacks); pFormattedMessage = (char*)ma_malloc(formattedLen + 1, &pLog->allocationCallbacks);
if (pFormattedMessage != NULL) { if (pFormattedMessage == NULL) {
return MA_OUT_OF_MEMORY;
}
ma_result result; ma_result result;
/* We'll get errors on newer versions of Visual Studio if we try to use vsprintf(). */ /* We'll get errors on newer versions of Visual Studio if we try to use vsprintf(). */
@@ -8812,10 +8818,6 @@ MA_API ma_result ma_log_postv(ma_log* pLog, ma_uint32 level, const char* pFormat
return result; return result;
} }
} else {
return MA_INVALID_OPERATION;
}
}
#else #else
{ {
/* Can't do anything because we don't have a safe way of to emulate vsnprintf() without a manual solution. */ /* Can't do anything because we don't have a safe way of to emulate vsnprintf() without a manual solution. */