use_appropriate_memory_deallocator

# HG changeset patch
# User Bob Friesenhahn <bfriesen@GraphicsMagick.org>
# Date 1626915582 18000
# Node ID 22aaff86b4aa34c10b3fbfb104adaaeef8653a36
# Parent  acf305f9ef3e85e6273d62e72d81cce03440eb3d
WritePDFImage(): Use appropriate memory deallocator for memory returned by StringToList().

Gbp-Pq: Name use_appropriate_memory_deallocator.patch

diff --git a/ChangeLog b/ChangeLog
index 9b49ca58557e372afd17fd57fbe14867a5046e26..2b9430175aeb77c7abe5f20e97c728acd8c875f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2021-07-21  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
+
+        * coders/pdf.c (WritePDFImage): Use appropriate memory deallocator
+        for memory returned by StringToList().  Fixes SourceForge issue
+        646 "Assertion failed using -label with PDF".
+
 2021-02-28  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
         * configure.ac: Add tests for Jasper jp2_decode(), jpc_decode(),

diff --git a/coders/pdf.c b/coders/pdf.c
index 18838374357a5cc91de1d60ce7bd9ea89b8a976f..6cf9963e52dd998722da6d7923e03a06eb96cbb7 100644 (file)
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -1046,9 +1046,9 @@ static unsigned int WritePDFImage(const ImageInfo *image_info,Image *image)
               FormatString(buffer,"(%.1024s) Tj\n",labels[i]);
               (void) WriteBlobString(image,buffer);
               (void) WriteBlobString(image,"ET\n");
-              MagickFreeResourceLimitedMemory(labels[i]);
+              MagickFreeMemory(labels[i]);
             }
-          MagickFreeResourceLimitedMemory(labels);
+          MagickFreeMemory(labels);
         }
       FormatString(buffer,"%g 0 0 %g %ld %ld cm\n",x_scale,y_scale,geometry.x,
                    geometry.y);

diff --git a/www/Changelog.html b/www/Changelog.html
index 06da763a730bc969e29f8a9cef4bcf4e96fdcc69..5a06812cac71dfbe0dc7abca4848dc9377f85fe3 100644 (file)
--- a/www/Changelog.html
+++ b/www/Changelog.html
@@ -35,6 +35,12 @@
 <div class="document">
 
 
+<p>2021-07-21  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>
+<blockquote>
+<p>* coders/pdf.c (WritePDFImage): Use appropriate memory deallocator
+for memory returned by StringToList().  Fixes SourceForge issue
+646 &quot;Assertion failed using -label with PDF&quot;.</p>
+</blockquote>
 <p>2021-02-28  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>
 <blockquote>
 <p>* configure.ac: Add tests for Jasper jp2_decode(), jpc_decode(),