From 7fb9fc1a2796365be394aa5927e7773ca07f10ee Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 28 May 2014 01:18:24 +0000 Subject: [PATCH] --- MagickCore/string.c | 9 +++++++++ 1 file changed, 9 insertions(+) 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) -- 2.40.0