From fca9a5c55641246ca9200c47135254ef39aa5065 Mon Sep 17 00:00:00 2001 From: dirk Date: Sun, 18 Jan 2015 21:30:57 +0000 Subject: [PATCH] Fixed uninitialized variable. --- coders/xtrn.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/coders/xtrn.c b/coders/xtrn.c index ae405b9a1..6abfed5aa 100644 --- a/coders/xtrn.c +++ b/coders/xtrn.c @@ -198,22 +198,25 @@ static Image *ReadXTRNImage(const ImageInfo *image_info, if (pSafeArray) { hr = SafeArrayGetLBound(pSafeArray, 1, &lBoundl); - if (SUCCEEDED(hr)) - hr = SafeArrayGetUBound(pSafeArray, 1, &lBoundu); if (SUCCEEDED(hr)) { - blob_length = lBoundu - lBoundl + 1; - hr = SafeArrayAccessData(pSafeArray,(void**) &blob_data); - if(SUCCEEDED(hr)) + hr = SafeArrayGetUBound(pSafeArray, 1, &lBoundu); + if (SUCCEEDED(hr)) { - *clone_info->filename='\0'; - *clone_info->magick='\0'; - if (*filename != '\0') - (void) CopyMagickString(clone_info->filename,filename, - MaxTextExtent); - image=BlobToImage(clone_info,blob_data,blob_length,exception); - hr=SafeArrayUnaccessData(pSafeArray); - CatchException(exception); + blob_length = lBoundu - lBoundl + 1; + hr = SafeArrayAccessData(pSafeArray,(void**) &blob_data); + if(SUCCEEDED(hr)) + { + *clone_info->filename='\0'; + *clone_info->magick='\0'; + if (*filename != '\0') + (void) CopyMagickString(clone_info->filename,filename, + MaxTextExtent); + image=BlobToImage(clone_info,blob_data,blob_length, + exception); + hr=SafeArrayUnaccessData(pSafeArray); + CatchException(exception); + } } } } @@ -406,6 +409,7 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info, *param3; param1 = param2 = param3 = (void *) NULL; + status=MagickTrue; if (LocaleCompare(image_info->magick,"XTRNFILE") == 0) { clone_info=CloneImageInfo(image_info); -- 2.40.0