Commit 96c0f67cf for imagemagick.org
commit 96c0f67cff6f5a9c3ea2a98bbfd0a5799422c5d6
Author: Dirk Lemstra <dirk@lemstra.org>
Date: Sat Jan 24 22:46:05 2026 +0100
Restored changes that were removed by accident.
diff --git a/coders/psd.c b/coders/psd.c
index fa24a3b9b..c76656b00 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -1334,6 +1334,7 @@ static MagickBooleanType ReadPSDChannelZip(Image *image,
ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
image->filename);
}
+ memset(pixels,0,count*sizeof(*pixels));
if (ReadBlob(image,compact_size,compact_pixels) != (ssize_t) compact_size)
{
pixels=(unsigned char *) RelinquishMagickMemory(pixels);
@@ -2644,19 +2645,23 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception)
*/
(void) SeekBlob(image,offset+(MagickOffsetType) length,SEEK_SET);
}
- /*
- If we are only "pinging" the image, then we're done - so return.
- */
if (EOFBlob(image) != MagickFalse)
{
if (profile != (StringInfo *) NULL)
profile=DestroyStringInfo(profile);
ThrowReaderException(CorruptImageError,"UnexpectedEndOfFile");
}
+ /*
+ If we are only "pinging" the image, then we're done - so return.
+ */
if (image_info->ping != MagickFalse)
{
if (profile != (StringInfo *) NULL)
- profile=DestroyStringInfo(profile);
+ {
+ (void) SetImageProfile(image,GetStringInfoName(profile),profile,
+ exception);
+ profile=DestroyStringInfo(profile);
+ }
(void) CloseBlob(image);
return(GetFirstImageInList(image));
}