]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Thu, 1 Sep 2011 13:50:43 +0000 (13:50 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Thu, 1 Sep 2011 13:50:43 +0000 (13:50 +0000)
MagickCore/string.c

index fc4dfc5a7696a34fbb14532f98bc8f0cd0371f1b..14bb3fd92a2cf6279b3a82ad78bcc6c204ba7ca8 100644 (file)
@@ -207,13 +207,15 @@ MagickExport StringInfo *BlobToStringInfo(const void *blob,const size_t length)
     *string_info;
 
   string_info=AcquireStringInfo(0);
-  string_info->datum=(unsigned char *) AcquireQuantumMemory(length,
-    sizeof(*string_info->datum));
+  if (~string_info->length >= (MaxTextExtent-1))
+    string_info->datum=(unsigned char *) AcquireQuantumMemory(length+
+      MaxTextExtent,sizeof(*string_info->datum));
   if (string_info->datum == (unsigned char *) NULL)
     {
       string_info=DestroyStringInfo(string_info);
       return((StringInfo *) NULL);
     }
+  string_info->length=length;
   if (blob != (const void *) NULL)
     (void) memcpy(string_info->datum,blob,length);
   return(string_info);