Skip to content

Add missing allocation failure check #584

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

Closed
kleisauke wants to merge 2 commits into from
+4 −3
Closed

Add missing allocation failure check #584

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72f5e93
Add missing allocation failure check
kleisauke Jul 17, 2026
383e13a
Guard against NULL mutexes
kleisauke Jul 17, 2026
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
7 changes: 4 additions & 3 deletions src/cmserr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,7 @@ static
void* defMtxCreate(cmsContext id)
{
_cmsMutex* ptr_mutex = (_cmsMutex*) _cmsMalloc(id, sizeof(_cmsMutex));
if (ptr_mutex == NULL) return NULL;
_cmsInitMutexPrimitive(ptr_mutex);
return (void*) ptr_mutex;
}
Expand Down Expand Up @@ -680,7 +681,7 @@ void CMSEXPORT _cmsDestroyMutex(cmsContext ContextID, void* mtx)
{
_cmsMutexPluginChunkType* ptr = (_cmsMutexPluginChunkType*) _cmsContextGetClientChunk(ContextID, MutexPlugin);

if (ptr ->DestroyMutexPtr != NULL) {
if (ptr ->DestroyMutexPtr != NULL && mtx != NULL) {

ptr ->DestroyMutexPtr(ContextID, mtx);
}
Expand All @@ -690,7 +691,7 @@ cmsBool CMSEXPORT _cmsLockMutex(cmsContext ContextID, void* mtx)
{
_cmsMutexPluginChunkType* ptr = (_cmsMutexPluginChunkType*) _cmsContextGetClientChunk(ContextID, MutexPlugin);

if (ptr ->LockMutexPtr == NULL) return TRUE;
if (ptr ->LockMutexPtr == NULL || mtx == NULL) return TRUE;

return ptr ->LockMutexPtr(ContextID, mtx);
}
Expand All @@ -699,7 +700,7 @@ void CMSEXPORT _cmsUnlockMutex(cmsContext ContextID, void* mtx)
{
_cmsMutexPluginChunkType* ptr = (_cmsMutexPluginChunkType*) _cmsContextGetClientChunk(ContextID, MutexPlugin);

if (ptr ->UnlockMutexPtr != NULL) {
if (ptr ->UnlockMutexPtr != NULL && mtx != NULL) {

ptr ->UnlockMutexPtr(ContextID, mtx);
}
Expand Down
Loading