• R/O
  • SSH

GM: Commit

Main GraphicsMagick source repository


Commit MetaInfo

Révision06f5cda2ec7b0923c7ada982d7f4d16f3bed580a (tree)
l'heure2022-05-09 00:55:57
AuteurBob Friesenhahn <bfriesen@Grap...>
CommiterBob Friesenhahn

Message de Log

ReadOnePNGImage(): Assure that entire image list is freed.

Change Summary

Modification

diff -r f36cb4a21602 -r 06f5cda2ec7b ChangeLog
--- a/ChangeLog Mon May 02 08:12:55 2022 -0500
+++ b/ChangeLog Sun May 08 10:55:57 2022 -0500
@@ -1,3 +1,10 @@
1+2022-05-08 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
2+
3+ * coders/png.c (ReadOnePNGImage): Assure that entire image list is
4+ freed. Addresses oss-fuzz 46997 "graphicsmagick:coder_MNG_fuzzer:
5+ Indirect-leak in MagickMallocCleared". This is a new issue due to
6+ incrementally seeking the complete correct error-handling cleanup.
7+
18 2022-05-02 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
29
310 * doc/options.imdoc: Add documentation for -define
diff -r f36cb4a21602 -r 06f5cda2ec7b VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx Mon May 02 08:12:55 2022 -0500
+++ b/VisualMagick/installer/inc/version.isx Sun May 08 10:55:57 2022 -0500
@@ -10,5 +10,5 @@
1010
1111 #define public MagickPackageName "GraphicsMagick"
1212 #define public MagickPackageVersion "1.4"
13-#define public MagickPackageVersionAddendum ".020220502"
14-#define public MagickPackageReleaseDate "snapshot-20220502"
13+#define public MagickPackageVersionAddendum ".020220508"
14+#define public MagickPackageReleaseDate "snapshot-20220508"
diff -r f36cb4a21602 -r 06f5cda2ec7b coders/png.c
--- a/coders/png.c Mon May 02 08:12:55 2022 -0500
+++ b/coders/png.c Sun May 08 10:55:57 2022 -0500
@@ -1629,10 +1629,17 @@
16291629 }
16301630 if (image)
16311631 {
1632- DestroyImage(image);
1632+ /* Image is part of mng_info->image list (see above) */
1633+ DestroyImageList(image);
16331634 image=(Image *) NULL;
16341635 mng_info->image=(Image *) NULL;
16351636 }
1637+ /* We are not aware that the following case ever happens */
1638+ if (mng_info->image)
1639+ {
1640+ DestroyImageList(mng_info->image);
1641+ mng_info->image=(Image *) NULL;
1642+ }
16361643 return(image);
16371644 }
16381645
diff -r f36cb4a21602 -r 06f5cda2ec7b magick/version.h
--- a/magick/version.h Mon May 02 08:12:55 2022 -0500
+++ b/magick/version.h Sun May 08 10:55:57 2022 -0500
@@ -38,8 +38,8 @@
3838 #define MagickLibVersion 0x272400
3939 #define MagickLibVersionText "1.4"
4040 #define MagickLibVersionNumber 27,24,0
41-#define MagickChangeDate "20220502"
42-#define MagickReleaseDate "snapshot-20220502"
41+#define MagickChangeDate "20220508"
42+#define MagickReleaseDate "snapshot-20220508"
4343
4444 /*
4545 The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r f36cb4a21602 -r 06f5cda2ec7b www/Changelog.html
--- a/www/Changelog.html Mon May 02 08:12:55 2022 -0500
+++ b/www/Changelog.html Sun May 08 10:55:57 2022 -0500
@@ -35,6 +35,12 @@
3535 <div class="document">
3636
3737
38+<p>2022-05-08 Bob Friesenhahn &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
39+<blockquote>
40+* coders/png.c (ReadOnePNGImage): Assure that entire image list is
41+freed. Addresses oss-fuzz 46997 &quot;graphicsmagick:coder_MNG_fuzzer:
42+Indirect-leak in MagickMallocCleared&quot;. This is a new issue due to
43+incrementally seeking the complete correct error-handling cleanup.</blockquote>
3844 <p>2022-05-02 Bob Friesenhahn &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
3945 <blockquote>
4046 * doc/options.imdoc: Add documentation for -define
Afficher sur ancien navigateur de dépôt.