Skip to content

fix invalid pointer return in ZeDMD_FormatLogMessage #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Cpasjuste wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix invalid pointer return in ZeDMD_FormatLogMessage #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/ZeDMD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,12 +899,10 @@ ZEDMDAPI void ZeDMD_SetLogCallback(ZeDMD* pZeDMD, ZeDMD_LogCallback callback, co
pZeDMD->SetLogCallback(callback, pUserData);
}

ZEDMDAPI const char* ZeDMD_FormatLogMessage(const char* format, va_list args, const void* pUserData)
ZEDMDAPI void ZeDMD_FormatLogMessage(char *out, const size_t outSize, const char* format, va_list args, const void* pUserData)
{
char buffer[1024];
vsnprintf(buffer, sizeof(buffer), format, args);

return buffer;
if (!out || outSize == 0) return;
vsnprintf(out, outSize, format, args);
}

ZEDMDAPI const char* ZeDMD_GetFirmwareVersion(ZeDMD* pZeDMD) { return pZeDMD->GetFirmwareVersion(); };
Expand Down
2 changes: 1 addition & 1 deletion src/ZeDMD.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,7 +648,7 @@ extern "C"
extern ZEDMDAPI ZeDMD* ZeDMD_GetInstance();
extern ZEDMDAPI const char* ZeDMD_GetVersion();
extern ZEDMDAPI void ZeDMD_SetLogCallback(ZeDMD* pZeDMD, ZeDMD_LogCallback callback, const void* pUserData);
extern ZEDMDAPI const char* ZeDMD_FormatLogMessage(const char* format, va_list args, const void* pUserData);
extern ZEDMDAPI void ZeDMD_FormatLogMessage(char *out, size_t outSize, const char* format, va_list args, const void* pUserData);
extern ZEDMDAPI const char* ZeDMD_GetFirmwareVersion(ZeDMD* pZeDMD);
extern ZEDMDAPI uint16_t ZeDMD_GetId(ZeDMD* pZeDMD);
extern ZEDMDAPI const char* ZeDMD_GetIdString(ZeDMD* pZeDMD);
Expand Down