GraphicsMagick: Hull(): Fix regression created by Mercurial chan...
GraphicsMagick Commits <[email protected]> Thu, 26 Sep 2024 18:01:45 -0500
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.23827.1727391720.8001.graphicsmagick-commit@lists.sourceforge.net> |
changeset 866f851e668c in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=866f851e668c summary: Hull(): Fix regression created by Mercurial changeset 16913:78aa63677935 "Add casts to prevent unnecessary value truncation in WIN64 build" on Saturday, October 21, 2023. diffstat: ChangeLog | 6 +++++- magick/gem.c | 12 +++++++++--- www/ChangeLog.html | 5 ++++- 3 files changed, 18 insertions(+), 5 deletions(-) diffs (66 lines): diff -r 21a6c1ffea4d -r 866f851e668c ChangeLog --- a/ChangeLog Thu Sep 26 11:31:25 2024 -0500 +++ b/ChangeLog Thu Sep 26 18:00:57 2024 -0500 @@ -1,5 +1,9 @@ 2024-09-26 Bob Friesenhahn <[email protected]> + * magick/gem.c (Hull): Fix regression created by Mercurial + changeset 16913:78aa63677935 "Add casts to prevent unnecessary + value truncation in WIN64 build" on Saturday, October 21, 2023. + * m4, TclMagick/unix/m4: Update to libtool 2.5.3. 2024-09-24 Bob Friesenhahn <[email protected]> @@ -7,7 +11,7 @@ * TclMagick/Makefile.am: 'make test' does something. Not yet what it should be. - * TclMagick/tests/test-wand.tcl: Fix memork leak of $img and $seq. + * TclMagick/tests/test-wand.tcl: Fix memory leak of $img and $seq. * TclMagick/tests/test-draw.tcl: Fix memory leak of $img. diff -r 21a6c1ffea4d -r 866f851e668c magick/gem.c --- a/magick/gem.c Thu Sep 26 11:31:25 2024 -0500 +++ b/magick/gem.c Thu Sep 26 18:00:57 2024 -0500 @@ -670,9 +670,15 @@ assert(f != (Quantum *) NULL); assert(g != (Quantum *) NULL); - p=f+((size_t) columns+2); - q=g+((size_t) columns+2); - r=p+(y_offset*((size_t) columns+2)+x_offset); + assert(!((size_t)columns > (size_t)columns+2)); + + p=f+((size_t)columns+2); + q=g+((size_t)columns+2); + + assert(!((p < f) || (q < g))); + + r=p+((ptrdiff_t)y_offset*((ptrdiff_t)columns+2)+(ptrdiff_t)x_offset); + #if defined(HAVE_OPENMP) # if defined(TUNE_OPENMP) # pragma omp parallel for schedule(runtime) diff -r 21a6c1ffea4d -r 866f851e668c www/ChangeLog.html --- a/www/ChangeLog.html Thu Sep 26 11:31:25 2024 -0500 +++ b/www/ChangeLog.html Thu Sep 26 18:00:57 2024 -0500 @@ -41,6 +41,9 @@ <p>2024-09-26 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>magick/gem.c (Hull): Fix regression created by Mercurial +changeset 16913:78aa63677935 "Add casts to prevent unnecessary +value truncation in WIN64 build" on Saturday, October 21, 2023.</p></li> <li><p>m4, TclMagick/unix/m4: Update to libtool 2.5.3.</p></li> </ul> </blockquote> @@ -49,7 +52,7 @@ <ul class="simple"> <li><p>TclMagick/Makefile.am: 'make test' does something. Not yet what it should be.</p></li> -<li><p>TclMagick/tests/test-wand.tcl: Fix memork leak of $img and $seq.</p></li> +<li><p>TclMagick/tests/test-wand.tcl: Fix memory leak of $img and $seq.</p></li> <li><p>TclMagick/tests/test-draw.tcl: Fix memory leak of $img.</p></li> <li><p>generic/TclMagickAppInit.c: Add a TclMagick test program.</p></li> <li><p>TclMagick/generic/TkMagick.c: Fix memory leak of 'fonts' and