GraphicsMagick: FreeMagickClientData(): Assure that jpeg_pixels ...
GraphicsMagick Commits <[email protected]> Mon, 12 Feb 2024 16:47:41 -0600
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.6396.1707778072.1744.graphicsmagick-commit@lists.sourceforge.net> |
changeset 93a62dab8fe9 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=93a62dab8fe9 summary: FreeMagickClientData(): Assure that jpeg_pixels is non-NULL before dereferencing it. diffstat: ChangeLog | 8 ++++++++ VisualMagick/installer/inc/version.isx | 4 ++-- coders/jpeg.c | 3 ++- magick/version.h | 4 ++-- www/ChangeLog.html | 10 ++++++++++ 5 files changed, 24 insertions(+), 5 deletions(-) diffs (73 lines): diff -r 5665249c364a -r 93a62dab8fe9 ChangeLog --- a/ChangeLog Sun Feb 11 16:03:39 2024 -0600 +++ b/ChangeLog Mon Feb 12 16:47:38 2024 -0600 @@ -1,3 +1,11 @@ +2024-02-12 Bob Friesenhahn <[email protected]> + + * coders/jpeg.c (FreeMagickClientData): Assure that jpeg_pixels is + non-NULL before dereferencing it. Resolves oss-fuzz issue 66666: + "graphicsmagick:coder_DCM_fuzzer: Null-dereference READ in + ReadJPEGImage". This is an issue introduced by yesterday's + submission. + 2024-02-11 Bob Friesenhahn <[email protected]> * magick/enum_strings.c (StringToCompressionType): Recognize diff -r 5665249c364a -r 93a62dab8fe9 VisualMagick/installer/inc/version.isx --- a/VisualMagick/installer/inc/version.isx Sun Feb 11 16:03:39 2024 -0600 +++ b/VisualMagick/installer/inc/version.isx Mon Feb 12 16:47:38 2024 -0600 @@ -10,5 +10,5 @@ #define public MagickPackageName "GraphicsMagick" #define public MagickPackageVersion "1.4" -#define public MagickPackageVersionAddendum ".020240211" -#define public MagickPackageReleaseDate "snapshot-20240211" +#define public MagickPackageVersionAddendum ".020240212" +#define public MagickPackageReleaseDate "snapshot-20240212" diff -r 5665249c364a -r 93a62dab8fe9 coders/jpeg.c --- a/coders/jpeg.c Sun Feb 11 16:03:39 2024 -0600 +++ b/coders/jpeg.c Mon Feb 12 16:47:38 2024 -0600 @@ -241,7 +241,8 @@ MagickFreeMemory(client_data->profiles[i].name); MagickFreeResourceLimitedMemory(client_data->profiles[i].info); } - MagickFreeResourceLimitedMemory(client_data->jpeg_pixels->t.v); + if (client_data->jpeg_pixels != (magick_jpeg_pixels_t *) NULL) + MagickFreeResourceLimitedMemory(client_data->jpeg_pixels->t.v); MagickFreeMemory(client_data); } diff -r 5665249c364a -r 93a62dab8fe9 magick/version.h --- a/magick/version.h Sun Feb 11 16:03:39 2024 -0600 +++ b/magick/version.h Mon Feb 12 16:47:38 2024 -0600 @@ -38,8 +38,8 @@ #define MagickLibVersion 0x272404 #define MagickLibVersionText "1.4" #define MagickLibVersionNumber 27,24,4 -#define MagickChangeDate "20240211" -#define MagickReleaseDate "snapshot-20240211" +#define MagickChangeDate "20240212" +#define MagickReleaseDate "snapshot-20240212" /* The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines diff -r 5665249c364a -r 93a62dab8fe9 www/ChangeLog.html --- a/www/ChangeLog.html Sun Feb 11 16:03:39 2024 -0600 +++ b/www/ChangeLog.html Mon Feb 12 16:47:38 2024 -0600 @@ -38,6 +38,16 @@ <div class="document" id="graphicsmagick-changelog"> <h1 class="title">GraphicsMagick ChangeLog</h1> +<p>2024-02-12 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p> +<blockquote> +<ul class="simple"> +<li><p>coders/jpeg.c (FreeMagickClientData): Assure that jpeg_pixels is +non-NULL before dereferencing it. Resolves oss-fuzz issue 66666: +"graphicsmagick:coder_DCM_fuzzer: Null-dereference READ in +ReadJPEGImage". This is an issue introduced by yesterday's +submission.</p></li> +</ul> +</blockquote> <p>2024-02-11 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p> <blockquote> <ul class="simple">