From d5433b26fc0d1ebbc2bd4e84b0f29fe59f9dbbe7 Mon Sep 17 00:00:00 2001 From: Dirk Lemstra Date: Fri, 13 Mar 2026 09:48:45 +0100 Subject: [PATCH] Revert changes so we can put it in a separate advisory. --- MagickCore/resource.c | 2 -- MagickCore/xml-tree.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/MagickCore/resource.c b/MagickCore/resource.c index 5cc977e17a..3c47840682 100644 --- a/MagickCore/resource.c +++ b/MagickCore/resource.c @@ -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]); diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c index a42626ff8e..ba76e376d2 100644 --- a/MagickCore/xml-tree.c +++ b/MagickCore/xml-tree.c @@ -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);