OSDN > Trouver un logiciel > graphicsmagick > SCM > hg > GM > Commit

graphicsmagick
Fork

GM: Commit

Main GraphicsMagick source repository

Révision	5ff36992c204633529a813f2a034d95b000c663a (tree)
l'heure	2021-11-16 10:59:08
Auteur	Bob Friesenhahn <bfriesen@Grap...>
Commiter	Bob Friesenhahn

ReadCAPTIONImage(): Set draw_info to NULL upon deallocation.

diff -r b052a71a5db7 -r 5ff36992c204 ChangeLog

--- a/ChangeLog Fri Nov 05 11:02:54 2021 -0500

+++ b/ChangeLog Mon Nov 15 19:59:08 2021 -0600

		@@ -1,3 +1,9 @@
	1	+2021-11-15 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
	2	+
	3	+ * coders/caption.c (ReadCAPTIONImage): Set draw_info to NULL upon
	4	+ deallocation. Fixes an assertion reported by Michael Melcher via
	5	+ the graphicsmagick-bugs list on November 11, 2021.
	6	+
1	7	2021-11-05 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
2	8
3	9	* coders/jp2.c (initialize_jasper): For JasPer 3.0.0 and later,

diff -r b052a71a5db7 -r 5ff36992c204 VisualMagick/installer/inc/version.isx

--- a/VisualMagick/installer/inc/version.isx Fri Nov 05 11:02:54 2021 -0500

+++ b/VisualMagick/installer/inc/version.isx Mon Nov 15 19:59:08 2021 -0600

		@@ -10,5 +10,5 @@
10	10
11	11	#define public MagickPackageName "GraphicsMagick"
12	12	#define public MagickPackageVersion "1.4"
13		-#define public MagickPackageVersionAddendum ".020211105"
14		-#define public MagickPackageReleaseDate "snapshot-20211105"
	13	+#define public MagickPackageVersionAddendum ".020211115"
	14	+#define public MagickPackageReleaseDate "snapshot-20211115"

diff -r b052a71a5db7 -r 5ff36992c204 coders/caption.c

--- a/coders/caption.c Fri Nov 05 11:02:54 2021 -0500

+++ b/coders/caption.c Mon Nov 15 19:59:08 2021 -0600

		@@ -160,6 +160,7 @@
160	160	if (status == MagickFail)
161	161	{
162	162	DestroyDrawInfo(draw_info);
	163	+ draw_info=(DrawInfo *) NULL;
163	164	MagickFreeMemory(caption);
164	165	ThrowCAPTIONException(TypeError,UnableToGetTypeMetrics,image);
165	166	}

diff -r b052a71a5db7 -r 5ff36992c204 magick/version.h

--- a/magick/version.h Fri Nov 05 11:02:54 2021 -0500

+++ b/magick/version.h Mon Nov 15 19:59:08 2021 -0600

		@@ -38,8 +38,8 @@
38	38	#define MagickLibVersion 0x252200
39	39	#define MagickLibVersionText "1.4"
40	40	#define MagickLibVersionNumber 25,22,0
41		-#define MagickChangeDate "20211105"
42		-#define MagickReleaseDate "snapshot-20211105"
	41	+#define MagickChangeDate "20211115"
	42	+#define MagickReleaseDate "snapshot-20211115"
43	43
44	44	/*
45	45	The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines

diff -r b052a71a5db7 -r 5ff36992c204 www/Changelog.html

--- a/www/Changelog.html Fri Nov 05 11:02:54 2021 -0500

+++ b/www/Changelog.html Mon Nov 15 19:59:08 2021 -0600

		@@ -35,6 +35,11 @@
35	35	<div class="document">
36	36
37	37
	38	+<p>2021-11-15 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>
	39	+<blockquote>
	40	+* coders/caption.c (ReadCAPTIONImage): Set draw_info to NULL upon
	41	+deallocation. Fixes an assertion reported by Michael Melcher via
	42	+the graphicsmagick-bugs list on November 11, 2021.</blockquote>
38	43	<p>2021-11-05 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>
39	44	<blockquote>
40	45	* coders/jp2.c (initialize_jasper): For JasPer 3.0.0 and later,