mirror of
https://github.com/ImageMagick/ImageMagick.git
synced 2026-05-25 11:24:54 +02:00
Revert changes so we can put it in a separate advisory.
This commit is contained in:
@@ -811,8 +811,6 @@ MagickExport MagickSizeType GetMagickResourceLimit(const ResourceType type)
|
||||
default: ;
|
||||
}
|
||||
resource=0;
|
||||
if (type >= NumberOfResourceTypes)
|
||||
return(resource);
|
||||
if (resource_semaphore[type] == (SemaphoreInfo *) NULL)
|
||||
ActivateSemaphoreInfo(&resource_semaphore[type]);
|
||||
LockSemaphoreInfo(resource_semaphore[type]);
|
||||
|
||||
@@ -1276,7 +1276,7 @@ static char *ConvertUTF16ToUTF8(const char *content,size_t *length)
|
||||
}
|
||||
}
|
||||
*length=(size_t) j;
|
||||
utf8=(char *) ResizeQuantumMemory(utf8,(*length+1),sizeof(*utf8));
|
||||
utf8=(char *) ResizeQuantumMemory(utf8,*length,sizeof(*utf8));
|
||||
if (utf8 != (char *) NULL)
|
||||
utf8[*length]='\0';
|
||||
return(utf8);
|
||||
|
||||
Reference in New Issue
Block a user