Skip to content

Commit 643deeb

Browse files
author
Cristy
committed
https://github.com/ImageMagick/ImageMagick/security/advisories/GHSA-qh3h-j545-h8c9
1 parent 35e9bd3 commit 643deeb

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

magick/image.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1677,7 +1677,6 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info,
16771677
canonical;
16781678

16791679
ssize_t
1680-
field_width,
16811680
offset;
16821681

16831682
canonical=MagickFalse;
@@ -1693,21 +1692,23 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info,
16931692
p++;
16941693
continue;
16951694
}
1696-
field_width=0;
1697-
if (*q == '0')
1698-
field_width=(ssize_t) strtol(q,&q,10);
16991695
switch (*q)
17001696
{
17011697
case 'd':
17021698
case 'o':
17031699
case 'x':
17041700
{
1701+
ssize_t
1702+
count;
1703+
17051704
q++;
17061705
c=(*q);
17071706
*q='\0';
1708-
(void) FormatLocaleString(filename+(p-format-offset),(size_t)
1707+
count=FormatLocaleString(filename+(p-format-offset),(size_t)
17091708
(MaxTextExtent-(p-format-offset)),p,value);
1710-
offset+=(4-field_width);
1709+
if ((count <= 0) || (count > (MagickPathExtent-(p-format-offset))))
1710+
return(0);
1711+
offset+=(ssize_t) ((q-p)-count);
17111712
*q=c;
17121713
(void) ConcatenateMagickString(filename,q,MaxTextExtent);
17131714
canonical=MagickTrue;

0 commit comments

Comments
 (0)