Commit d5433b26f for imagemagick.org
commit d5433b26fc0d1ebbc2bd4e84b0f29fe59f9dbbe7
Author: Dirk Lemstra <dirk@lemstra.org>
Date: Fri Mar 13 09:48:45 2026 +0100
Revert changes so we can put it in a separate advisory.
diff --git a/MagickCore/resource.c b/MagickCore/resource.c
index 5cc977e17..3c4784068 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 a42626ff8..ba76e376d 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);