From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 28 May 2014 01:18:24 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2261
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7fb9fc1a2796365be394aa5927e7773ca07f10ee;p=imagemagick

---

diff --git a/MagickCore/string.c b/MagickCore/string.c
index 85d2f642c..1c9eb8526 100644
--- a/MagickCore/string.c
+++ b/MagickCore/string.c
@@ -213,6 +213,9 @@ MagickExport StringInfo *BlobToStringInfo(const void *blob,const size_t length)
     *string_info;
 
   string_info=AcquireStringInfo(0);
+  if (string_info->datum != (unsigned char *) NULL)
+    string_info->datum=(unsigned char *) RelinquishMagickMemory(
+      string_info->datum);
   string_info->length=length;
   if (~string_info->length >= (MaxTextExtent-1))
     string_info->datum=(unsigned char *) AcquireQuantumMemory(
@@ -647,6 +650,9 @@ MagickExport StringInfo *ConfigureFileToStringInfo(const char *filename)
   string[length]='\0';
   file=close(file)-1;
   string_info=AcquireStringInfo(0);
+  if (string_info->datum != (unsigned char *) NULL)
+    string_info->datum=(unsigned char *) RelinquishMagickMemory(
+      string_info->datum);
   (void) CopyMagickString(string_info->path,filename,MaxTextExtent);
   string_info->length=length;
   string_info->datum=(unsigned char *) string;
@@ -1026,6 +1032,9 @@ MagickExport StringInfo *FileToStringInfo(const char *filename,
   (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename);
   assert(exception != (ExceptionInfo *) NULL);
   string_info=AcquireStringInfo(0);
+  if (string_info->datum != (unsigned char *) NULL)
+    string_info->datum=(unsigned char *) RelinquishMagickMemory(
+      string_info->datum);
   (void) CopyMagickString(string_info->path,filename,MaxTextExtent);
   string_info->datum=FileToBlob(filename,extent,&string_info->length,exception);
   if (string_info->datum == (unsigned char *) NULL)