From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 22 May 2015 21:32:42 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1017
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1446bc97e7bb51a0cbca3b84f32cc4bbad5dcce5;p=imagemagick

---

diff --git a/coders/pnm.c b/coders/pnm.c
index 56dd35b34..a7becad3f 100644
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -1701,8 +1701,8 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image,
           "DEPTH %.20g\nMAXVAL %.20g\n",(double) packet_size,(double)
           ((MagickOffsetType) GetQuantumRange(image->depth)));
         (void) WriteBlobString(image,buffer);
-        (void) FormatLocaleString(buffer,MagickPathExtent,"TUPLTYPE %s\nENDHDR\n",
-          type);
+        (void) FormatLocaleString(buffer,MagickPathExtent,
+          "TUPLTYPE %s\nENDHDR\n",type);
         (void) WriteBlobString(image,buffer);
       }
     /*
@@ -1719,6 +1719,9 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image,
           Convert image to a PBM image.
         */
         (void) SetImageType(image,BilevelType,exception);
+        quantum_info=AcquireQuantumInfo(image_info,image);
+        if (quantum_info == (QuantumInfo *) NULL)
+          ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
         q=pixels;
         for (y=0; y < (ssize_t) image->rows; y++)
         {
@@ -1736,14 +1739,11 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image,
             *q++=(unsigned char) (GetPixelLuma(image,p) >= (QuantumRange/2.0) ?
               '0' : '1');
             *q++=' ';
-            if ((q-pixels+2) >= 80)
-              {
-                *q++='\n';
-                (void) WriteBlob(image,q-pixels,pixels);
-                q=pixels;
-              }
             p+=GetPixelChannels(image);
           }
+          *q++='\n';
+          (void) WriteBlob(image,q-pixels,pixels);
+          q=pixels;
           if (image->previous == (Image *) NULL)
             {
               status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -1757,6 +1757,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image,
             *q++='\n';
             (void) WriteBlob(image,q-pixels,pixels);
           }
+        quantum_info=DestroyQuantumInfo(quantum_info);
         break;
       }
       case '2':
@@ -1794,11 +1795,11 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image,
                 ScaleQuantumToChar(index));
             else
               if (image->depth <= 16)
-                count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent,"%u ",
-                  ScaleQuantumToShort(index));
+                count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent,
+                  "%u ",ScaleQuantumToShort(index));
               else
-                count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent,"%u ",
-                  ScaleQuantumToLong(index));
+                count=(ssize_t) FormatLocaleString(buffer,MagickPathExtent,
+                  "%u ",ScaleQuantumToLong(index));
             extent=(size_t) count;
             (void) strncpy((char *) q,buffer,extent);
             q+=extent;