GraphicsMagick: JP2: JasPer expects its allocator to return non-...

changeset 7a47d374177d in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=7a47d374177d
summary: JP2: JasPer expects its allocator to return non-null for zero size

diffstat:

 ChangeLog                              |  5 +++++
 VisualMagick/installer/inc/version.isx |  4 ++--
 coders/jp2.c                           |  3 ++-
 magick/version.h                       |  4 ++--
 www/Changelog.html                     |  4 ++++
 5 files changed, 15 insertions(+), 5 deletions(-)

diffs (64 lines):

diff -r 481bc6ca2893 -r 7a47d374177d ChangeLog
--- a/ChangeLog	Sun Dec 05 13:29:29 2021 -0600
+++ b/ChangeLog	Sun Dec 12 09:51:15 2021 -0600
@@ -1,3 +1,8 @@
+2021-12-12  Bob Friesenhahn  <[email protected]>
+
+        * coders/jp2.c (alloc_rlm): JasPer expects its allocator to return
+        non-null for zero size
+
 2021-12-05  Bob Friesenhahn  <[email protected]>
 
         * Makefile.am (snapshot): Update the snapshot target to distribute
diff -r 481bc6ca2893 -r 7a47d374177d VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Sun Dec 05 13:29:29 2021 -0600
+++ b/VisualMagick/installer/inc/version.isx	Sun Dec 12 09:51:15 2021 -0600
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020211205"
-#define public MagickPackageReleaseDate "snapshot-20211205"
+#define public MagickPackageVersionAddendum ".020211212"
+#define public MagickPackageReleaseDate "snapshot-20211212"
diff -r 481bc6ca2893 -r 7a47d374177d coders/jp2.c
--- a/coders/jp2.c	Sun Dec 05 13:29:29 2021 -0600
+++ b/coders/jp2.c	Sun Dec 12 09:51:15 2021 -0600
@@ -412,7 +412,8 @@
 static void *alloc_rlm(struct jas_allocator_s *allocator, size_t size)
 {
   (void) allocator;
-  return _MagickAllocateResourceLimitedMemory(size);
+  /* JasPer expects its allocator to return non-null for zero size */
+  return _MagickAllocateResourceLimitedMemory(size == 0 ? 1 : size);
 }
 static void free_rlm(struct jas_allocator_s *allocator, void *pointer)
 {
diff -r 481bc6ca2893 -r 7a47d374177d magick/version.h
--- a/magick/version.h	Sun Dec 05 13:29:29 2021 -0600
+++ b/magick/version.h	Sun Dec 12 09:51:15 2021 -0600
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x252200
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 25,22,0
-#define MagickChangeDate   "20211205"
-#define MagickReleaseDate  "snapshot-20211205"
+#define MagickChangeDate   "20211212"
+#define MagickReleaseDate  "snapshot-20211212"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 481bc6ca2893 -r 7a47d374177d www/Changelog.html
--- a/www/Changelog.html	Sun Dec 05 13:29:29 2021 -0600
+++ b/www/Changelog.html	Sun Dec 12 09:51:15 2021 -0600
@@ -35,6 +35,10 @@
 <div class="document">
 
 
+<p>2021-12-12  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>
+* coders/jp2.c (alloc_rlm): JasPer expects its allocator to return
+non-null for zero size</blockquote>
 <p>2021-12-05  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>* Makefile.am (snapshot): Update the snapshot target to distribute