Merge branch 'master' of https://github.com/mm2/Little-CMS

mm2 · Nov 3, 2023 · 282c96e · 282c96e
2 parents 10104ef + c58f881
commit 282c96e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/cmserr.c b/src/cmserr.c
@@ -92,7 +92,8 @@ cmsBool   _cmsRegisterMemHandlerPlugin(cmsContext ContextID, cmsPluginBase* Plug
 static
 void* _cmsMallocDefaultFn(cmsContext ContextID, cmsUInt32Number size)
 {
-    if (size > MAX_MEMORY_FOR_ALLOC) return NULL;  // Never allow over maximum
+    // Never allow 0 or over maximum
+    if (size == 0 || size > MAX_MEMORY_FOR_ALLOC) return NULL;
 
     return (void*) malloc(size);
 

diff --git a/src/cmsnamed.c b/src/cmsnamed.c
@@ -817,15 +817,16 @@ void CMSEXPORT cmsFreeProfileSequenceDescription(cmsSEQ* pseq)
     if (pseq == NULL)
         return;
 
-    for (i=0; i < pseq ->n; i++) {
-        if (pseq->seq != NULL) {
+    if (pseq ->seq != NULL) {
+        for (i=0; i < pseq ->n; i++) {
             if (pseq ->seq[i].Manufacturer != NULL) cmsMLUfree(pseq ->seq[i].Manufacturer);
             if (pseq ->seq[i].Model != NULL) cmsMLUfree(pseq ->seq[i].Model);
             if (pseq ->seq[i].Description != NULL) cmsMLUfree(pseq ->seq[i].Description);
         }
+
+        _cmsFree(pseq ->ContextID, pseq ->seq);
     }
 
-    if (pseq ->seq != NULL) _cmsFree(pseq ->ContextID, pseq ->seq);
     _cmsFree(pseq -> ContextID, pseq);
 }
 

diff --git a/src/cmsvirt.c b/src/cmsvirt.c
@@ -1196,6 +1196,9 @@ cmsHPROFILE CMSEXPORT cmsTransform2DeviceLink(cmsHTRANSFORM hTransform, cmsFloat
 
     _cmsAssert(hTransform != NULL);
 
+    // Check if the pipeline holding is valid
+    if (xform -> Lut == NULL) return NULL;
+
     // Get the first mpe to check for named color
     mpe = cmsPipelineGetPtrToFirstStage(xform ->Lut);