From 8a68c249442d46dd785dba54a03fb9242574ed63 Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 7 Apr 2014 20:43:37 +0000 Subject: [PATCH] --- MagickCore/string.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/MagickCore/string.c b/MagickCore/string.c index 718eccdcb..1db06c625 100644 --- a/MagickCore/string.c +++ b/MagickCore/string.c @@ -173,15 +173,12 @@ MagickExport StringInfo *AcquireStringInfo(const size_t length) (void) ResetMagickMemory(string_info,0,sizeof(*string_info)); string_info->signature=MagickSignature; string_info->length=length; - if (string_info->length != 0) - { - string_info->datum=(unsigned char *) NULL; - if (~string_info->length >= (MaxTextExtent-1)) - string_info->datum=(unsigned char *) AcquireQuantumMemory( - string_info->length+MaxTextExtent,sizeof(*string_info->datum)); - if (string_info->datum == (unsigned char *) NULL) - ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); - } + string_info->datum=(unsigned char *) NULL; + if (~string_info->length >= (MaxTextExtent-1)) + string_info->datum=(unsigned char *) AcquireQuantumMemory( + string_info->length+MaxTextExtent,sizeof(*string_info->datum)); + if (string_info->datum == (unsigned char *) NULL) + ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); return(string_info); } -- 2.40.0