Ryujinx/moltenvk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #874 from js6i/master

Browse Source 
Malloc redoBuff in reportMessage to prevent stack overflow
This commit is contained in:
Bill Hollings 2020-05-08 10:06:26 -04:00 committed by GitHub
commit a6801e97f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MoltenVK/MoltenVK/Utility/MVKBaseObject.mm
View File

@ -119,10 +119,9 @@ void MVKBaseObject::reportMessage(MVKBaseObject* mvkObj, int aslLvl, const char*
// If message is too big for original buffer, allocate a buffer big enough to hold it and
// write the message out again. We only want to do this double writing if we have to.
// Create the redoBuff outside scope of if block to allow it to be referencable by pMessage later below.
int redoBuffSize = (msgLen >= kOrigBuffSize) ? msgLen + 1 : 0;
char redoBuff[redoBuffSize];
if (redoBuffSize > 0) {
char *redoBuff = NULL;
if (redoBuffSize > 0 && (redoBuff = (char *)malloc(redoBuffSize))) {
pMessage = redoBuff;
vsnprintf(redoBuff, redoBuffSize, format, redoArgs);
}
@ -135,6 +134,8 @@ void MVKBaseObject::reportMessage(MVKBaseObject* mvkObj, int aslLvl, const char*
// Broadcast the message to any Vulkan debug report callbacks
if (hasDebugCallbacks) { mvkInst->debugReportMessage(mvkAPIObj, aslLvl, pMessage); }
free(redoBuff);
}
VkResult MVKBaseObject::reportError(VkResult vkErr, const char* format, ...) {