Attachment 241711 Details for Bug 310081 – needed for backport

[patch] needed for backport

ImageMagick-6.2.3-quantum-memory.patch (text/plain), 3.54 KB, created by Mark J. Cox on 2007-10-29 11:31:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark J. Cox

Created: 2007-10-29 11:31:08 UTC

Size: 3.54 KB

patch

obsolete

>diff -r afaa74b998a6 magick/memory.c
>--- a/magick/memory.c	Fri Sep 28 03:44:24 2007 -0800
>+++ b/magick/memory.c	Fri Sep 28 03:47:01 2007 -0800
>@@ -356,6 +356,48 @@ MagickExport void *AcquireMagickMemory(c
>   return(memory);
> }
> 
>+
>+/*
>+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>+%                                                                             %
>+%                                                                             %
>+%                                                                             %
>+%   A c q u i r e Q u a n t u m M e m o r y                                   %
>+%                                                                             %
>+%                                                                             %
>+%                                                                             %
>+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>+%
>+%  AcquireQuantumMemory() returns a pointer to a block of memory at least
>+%  count * quantum bytes suitably aligned for any use.
>+%
>+%  The format of the AcquireQuantumMemory method is:
>+%
>+%      void *AcquireQuantumMemory(const size_t count,const size_t quantum)
>+%
>+%  A description of each parameter follows:
>+%
>+%    o count: The number of quantum elements to allocate.
>+%
>+%    o quantum: The number of bytes in each quantum.
>+%
>+*/
>+MagickExport void *AcquireQuantumMemory(const size_t count,const size_t quantum)
>+{
>+  size_t
>+    size;
>+
>+  size=count*quantum;
>+  if ((count == 0) || (quantum != (size/count)))
>+    {
>+      errno=ENOMEM;
>+      return((void *) NULL);
>+    }
>+  return(AcquireMagickMemory(size));
>+}
>+
>+
>+
> /*
> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
> %                                                                             %
>@@ -698,3 +740,47 @@ MagickExport void *ResizeMagickMemory(vo
>     memory=RelinquishMagickMemory(memory);
>   return(block);
> }
>+
>+/*
>+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>+%                                                                             %
>+%                                                                             %
>+%                                                                             %
>+%   R e s i z e Q u a n t u m M e m o r y                                     %
>+%                                                                             %
>+%                                                                             %
>+%                                                                             %
>+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
>+%
>+%  ResizeQuantumMemory() changes the size of the memory and returns a pointer
>+%  to the (possibly moved) block.  The contents will be unchanged up to the
>+%  lesser of the new and old sizes.
>+%
>+%  The format of the ResizeQuantumMemory method is:
>+%
>+%      void *ResizeQuantumMemory(void *memory,const size_t count,
>+%        const size_t quantum)
>+%
>+%  A description of each parameter follows:
>+%
>+%    o memory: A pointer to a memory allocation.
>+%
>+%    o count: The number of quantum elements to allocate.
>+%
>+%    o quantum: The number of bytes in each quantum.
>+%
>+*/
>+MagickExport void *ResizeQuantumMemory(void *memory,const size_t count,
>+  const size_t quantum)
>+{
>+  size_t
>+    size;
>+
>+  size=count*quantum;
>+  if ((count == 0) || (quantum != (size/count)))
>+    {
>+      errno=ENOMEM;
>+      return((void *) NULL);
>+    }
>+  return(ResizeMagickMemory(memory,size));
>+}

Actions: View | Diff

Attachments on bug 310081: 241681 | 241701 | 241711 | 278181