helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-04-02 02:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

imagemagick: patch CVE-2025-53101

Browse Source 
Details: https://nvd.nist.gov/vuln/detail/CVE-2025-53101

Pick the patch mentioned in the details of the above link.

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
This commit is contained in:
Gyorgy Sarvari 2025-10-08 22:59:07 +02:00
parent e257ea4640
commit 4fb661fec1
2 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
meta-oe/recipes-support/imagemagick/imagemagick/0001-https-github.com-ImageMagick-ImageMagick-security-ad.patch Normal file
View File

@ -0,0 +1,52 @@
From 0afb803b504b572f3dc654ac4e39e5bd8df7ee03 Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Fri, 27 Jun 2025 20:02:12 -0400
Subject: [PATCH]
https://github.com/ImageMagick/ImageMagick/security/advisories/GHSA-qh3h-j545-h8c9
CVE: CVE-2025-53101
Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/66dc8f51c11b0ae1f1cdeacd381c3e9a4de69774]
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
---
MagickCore/image.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/MagickCore/image.c b/MagickCore/image.c
index 03a5972d0..abca0a9ae 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -1665,7 +1665,6 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info,
canonical;
ssize_t
- field_width,
offset;
canonical=MagickFalse;
@@ -1681,21 +1680,21 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info,
p++;
continue;
}
- field_width=0;
- if (*q == '0')
- field_width=(ssize_t) strtol(q,&q,10);
switch (*q)
{
case 'd':
case 'o':
case 'x':
{
+ ssize_t count;
q++;
c=(*q);
*q='\0';
- (void) FormatLocaleString(filename+(p-format-offset),(size_t)
+ count=FormatLocaleString(filename+(p-format-offset),(size_t)
(MagickPathExtent-(p-format-offset)),p,value);
- offset+=(4-field_width);
+ if ((count <= 0) || (count > (MagickPathExtent-(p-format-offset))))
+ return(0);
+ offset+=(ssize_t) ((q-p)-count);
*q=c;
(void) ConcatenateMagickString(filename,q,MagickPathExtent);
canonical=MagickTrue;

1
meta-oe/recipes-support/imagemagick/imagemagick_7.1.1-43.bb
View File

@ -17,6 +17,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt
file://0001-Added-extra-checks-to-make-sure-we-don-t-get-stuck-i.patch \
file://0002-Added-missing-return.patch \
file://0001-Fixed-memory-leak-when-entering-StreamImage-multiple.patch \
file://0001-https-github.com-ImageMagick-ImageMagick-security-ad.patch \
"
SRCREV = "a2d96f40e707ba54b57e7d98c3277d3ea6611ace"