Skip to content

Commit 14234b2

Browse files
author
Cristy
committed
https://github.com/ImageMagick/ImageMagick/security/advisories/GHSA-qp29-wxp5-wh82
1 parent 5d54d24 commit 14234b2

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

coders/png.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6753,7 +6753,7 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info,
67536753
if (((mng_info->magn_methx > 0) && (mng_info->magn_methx <= 5)) &&
67546754
((mng_info->magn_methy > 0) && (mng_info->magn_methy <= 5)))
67556755
{
6756-
png_uint_32
6756+
size_t
67576757
magnified_height,
67586758
magnified_width;
67596759

@@ -6767,19 +6767,19 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info,
67676767
mng_info->magn_methy = 1;
67686768
if (mng_info->magn_methx == 1)
67696769
{
6770-
magnified_width=mng_info->magn_ml;
6770+
magnified_width=(size_t) mng_info->magn_ml;
67716771

67726772
if (image->columns > 1)
67736773
magnified_width += mng_info->magn_mr;
67746774

67756775
if (image->columns > 2)
6776-
magnified_width += (png_uint_32)
6776+
magnified_width += (size_t)
67776777
((image->columns-2)*(mng_info->magn_mx));
67786778
}
67796779

67806780
else
67816781
{
6782-
magnified_width=(png_uint_32) image->columns;
6782+
magnified_width=(size_t) image->columns;
67836783

67846784
if (image->columns > 1)
67856785
magnified_width += mng_info->magn_ml-1;
@@ -6788,25 +6788,25 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info,
67886788
magnified_width += mng_info->magn_mr-1;
67896789

67906790
if (image->columns > 3)
6791-
magnified_width += (png_uint_32)
6791+
magnified_width += (size_t)
67926792
((image->columns-3)*(mng_info->magn_mx-1));
67936793
}
67946794

67956795
if (mng_info->magn_methy == 1)
67966796
{
6797-
magnified_height=mng_info->magn_mt;
6797+
magnified_height=(size_t) mng_info->magn_mt;
67986798

67996799
if (image->rows > 1)
68006800
magnified_height += mng_info->magn_mb;
68016801

68026802
if (image->rows > 2)
6803-
magnified_height += (png_uint_32)
6803+
magnified_height += (size_t)
68046804
((image->rows-2)*(mng_info->magn_my));
68056805
}
68066806

68076807
else
68086808
{
6809-
magnified_height=(png_uint_32) image->rows;
6809+
magnified_height=(size_t) image->rows;
68106810

68116811
if (image->rows > 1)
68126812
magnified_height += mng_info->magn_mt-1;
@@ -6815,7 +6815,7 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info,
68156815
magnified_height += mng_info->magn_mb-1;
68166816

68176817
if (image->rows > 3)
6818-
magnified_height += (png_uint_32)
6818+
magnified_height += (size_t)
68196819
((image->rows-3)*(mng_info->magn_my-1));
68206820
}
68216821

0 commit comments

Comments
 (0)