sync lcms2 bug-fix

AlizaMedicalImaging · Aug 11, 2022 · 702b7f1 · 702b7f1
1 parent 3f20599
commit 702b7f1
Showing 1 changed file with 28 additions and 16 deletions.
diff --git a/alizalcms/cmscgats.c b/alizalcms/cmscgats.c
@@ -367,6 +367,7 @@ static
 string* StringAlloc(cmsIT8* it8, int max)
 {
  string* s = (string*) AllocChunk(it8, sizeof(string));
+ if (s == NULL) return NULL;
 
  s->it8 = it8;
  s->max = max;
@@ -391,7 +392,9 @@ void StringAppend(string* s, char c)
 
  s->max *= 10;
  new_ptr = (char*) AllocChunk(s->it8, s->max);
- memcpy(new_ptr, s->begin, s->len);
+ if (new_ptr != NULL)
+ memcpy(new_ptr, s->begin, s->len);
+
  s->begin = new_ptr;
  }
 
@@ -992,8 +995,10 @@ void InSymbol(cmsIT8* it8)
  if(FileNest == NULL) {
 
  FileNest = it8 ->FileStack[it8 -> IncludeSP + 1] = (FILECTX*)AllocChunk(it8, sizeof(FILECTX));
- //if(FileNest == NULL)
- // TODO: how to manage out-of-memory conditions?
+ if (FileNest == NULL) {
+ SynError(it8, "Out of memory");
+ return;
+ }
  }
 
  if (BuildAbsolutePath(StringPtr(it8->str),
@@ -1167,9 +1172,11 @@ void* AllocChunk(cmsIT8* it8, cmsUInt32Number size)
  it8 ->Allocator.BlockSize = size;
 
  it8 ->Allocator.Used = 0;
- it8 ->Allocator.Block = (cmsUInt8Number*)  AllocBigBlock(it8, it8 ->Allocator.BlockSize);
+ it8 ->Allocator.Block = (cmsUInt8Number*) AllocBigBlock(it8, it8 ->Allocator.BlockSize); 
  }
 
+ if (it8->Allocator.Block == NULL) return NULL;
+
  ptr = it8 ->Allocator.Block + it8 ->Allocator.Used;
  it8 ->Allocator.Used += size;
 
@@ -2535,15 +2542,18 @@ cmsUInt32Number CMSEXPORT cmsIT8EnumProperties(cmsHANDLE hIT8, char ***PropertyN
  }
 
 
- Props = (char **) AllocChunk(it8, sizeof(char *) * n);
+ Props = (char**)AllocChunk(it8, sizeof(char*) * n);
+ if (Props != NULL) {
 
- // Pass#2 - Fill pointers
- n = 0;
- for (p = t -> HeaderList; p != NULL; p = p->Next) {
- Props[n++] = p -> Keyword;
- }
+ // Pass#2 - Fill pointers
+ n = 0;
+ for (p = t->HeaderList; p != NULL; p = p->Next) {
+ Props[n++] = p->Keyword;
+ }
+
+ }
+ *PropertyNames = Props;
 
- *PropertyNames = Props;
  return n;
 }
 
@@ -2575,12 +2585,14 @@ cmsUInt32Number CMSEXPORT cmsIT8EnumPropertyMulti(cmsHANDLE hIT8, const char* cP
 
 
  Props = (const char **) AllocChunk(it8, sizeof(char *) * n);
+ if (Props != NULL) {
 
- // Pass#2 - Fill pointers
- n = 0;
- for (tmp = p; tmp != NULL; tmp = tmp->NextSubkey) {
- if(tmp->Subkey != NULL)
- Props[n++] = p ->Subkey;
+ // Pass#2 - Fill pointers
+ n = 0;
+ for (tmp = p; tmp != NULL; tmp = tmp->NextSubkey) {
+ if (tmp->Subkey != NULL)
+ Props[n++] = p->Subkey;
+ }
  }
 
  *SubpropertyNames = Props;