Commit 84a15bf66 for imagemagick.org
commit 84a15bf667f7bd3b4a17d3544b8d5cba0812eb5d
Author: Cristy <urban-warrior@imagemagick.org>
Date: Sat May 2 19:13:10 2026 -0400
https://github.com/ImageMagick/ImageMagick/security/advisories/GHSA-jqq5-8px3-9m6m
diff --git a/MagickCore/display.c b/MagickCore/display.c
index bbeeced69..b9da02fb3 100644
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -13193,7 +13193,7 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info,
return((Image *) NULL);
q=p;
while ((*q != '\xff') && (*q != '\0') &&
- ((size_t) (q-p) < sizeof(filename)))
+ ((size_t) (q-p+1) < sizeof(filename)))
q++;
(void) CopyMagickString(filename,p,(size_t) (q-p+1));
/*
@@ -13287,7 +13287,7 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info,
q=p;
while ((*q != '\xff') && (*q != '\0') &&
- ((size_t) (q-p) < sizeof(filename)))
+ ((size_t) (q-p+1) < sizeof(filename)))
q++;
(void) CopyMagickString(filename,p,(size_t) (q-p+1));
p=q;
diff --git a/coders/json.c b/coders/json.c
index 1621b2a1c..e0df78e68 100644
--- a/coders/json.c
+++ b/coders/json.c
@@ -1545,7 +1545,7 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file,
{
q=p;
while ((*q != '\xff') && (*q != '\0') &&
- ((size_t) (q-p) < sizeof(image_info->filename)))
+ ((size_t) (q-p+1) < sizeof(image_info->filename)))
q++;
(void) CopyMagickString(image_info->filename,p,(size_t) (q-p+1));
p=q;
diff --git a/coders/yaml.c b/coders/yaml.c
index 3ef50a717..d68111820 100644
--- a/coders/yaml.c
+++ b/coders/yaml.c
@@ -1514,7 +1514,7 @@ static MagickBooleanType EncodeImageAttributes(Image *image,FILE *file,
{
q=p;
while ((*q != '\xff') && (*q != '\0') &&
- ((size_t) (q-p) < sizeof(image_info->filename)))
+ ((size_t) (q-p+1) < sizeof(image_info->filename)))
q++;
(void) CopyMagickString(image_info->filename,p,(size_t) (q-p+1));
p=q;