Commit c5a692ad2 for imagemagick.org
commit c5a692ad2cdd18948cbf61436f7e9a97e9b2f42a
Author: Cristy <urban-warrior@imagemagick.org>
Date: Tue Jul 7 13:18:42 2026 -0400
revert
diff --git a/MagickCore/image.c b/MagickCore/image.c
index 0d45792a1..91d44dbdf 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -1011,8 +1011,6 @@ MagickExport ImageInfo *CloneImageInfo(const ImageInfo *image_info)
image_info->profile);
SetImageInfoFile(clone_info,image_info->file);
SetImageInfoBlob(clone_info,image_info->blob,image_info->length);
- (void) memcpy(clone_info->properties,image_info->properties,
- sizeof(struct stat));
clone_info->stream=image_info->stream;
clone_info->custom_stream=image_info->custom_stream;
(void) CopyMagickString(clone_info->magick,image_info->magick,
@@ -1296,8 +1294,6 @@ MagickExport ImageInfo *DestroyImageInfo(ImageInfo *image_info)
if (image_info->profile != (StringInfo *) NULL)
image_info->profile=(void *) DestroyStringInfo((StringInfo *)
image_info->profile);
- if (image_info->properties != NULL)
- image_info->properties=RelinquishMagickMemory(image_info->properties);
DestroyImageOptions(image_info);
image_info->signature=(~MagickCoreSignature);
image_info=(ImageInfo *) RelinquishMagickMemory(image_info);
@@ -1388,8 +1384,6 @@ MagickExport void GetImageInfo(ImageInfo *image_info)
GetPixelInfoRGBA(BorderColorRGBA,&image_info->border_color);
GetPixelInfoRGBA(MatteColorRGBA,&image_info->matte_color);
GetPixelInfoRGBA(TransparentColorRGBA,&image_info->transparent_color);
- image_info->properties=AcquireCriticalMemory(sizeof(struct stat));
- (void) memset(image_info->properties,0,sizeof(struct stat));
image_info->debug=(GetLogEventMask() & ImageEvent) != 0 ? MagickTrue :
MagickFalse;
image_info->signature=MagickCoreSignature;
@@ -3092,8 +3086,6 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info,
(void) CopyMagickString(image_info->filename,component,
MagickPathExtent);
image_info->temporary=MagickTrue;
- (void) memcpy(image_info->properties,GetBlobProperties(image),
- sizeof(struct stat));
}
magick=(unsigned char *) AcquireQuantumMemory(1,magick_size);
if (magick == (unsigned char *) NULL)
diff --git a/MagickCore/image.h b/MagickCore/image.h
index 682915888..bbc3dfe33 100644
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -475,9 +475,6 @@ struct _ImageInfo
PixelInfo
matte_color; /* matte (frame) color */
-
- void
- *properties;
};
extern MagickExport ChannelType
diff --git a/coders/png.c b/coders/png.c
index 1bfe550c5..c875d2e28 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -4699,20 +4699,6 @@ static Image *ReadOneJNGImage(MngReadInfo *mng_info,
color_image_info->ping=MagickFalse; /* To do: avoid this */
CloseBlob(color_image);
jng_image=ReadImage(color_image_info,exception);
- if (jng_image != (Image *) NULL)
- {
- const struct stat
- *color_properties = GetBlobProperties(color_image),
- *jng_properties = GetBlobProperties(jng_image);
-
- if ((color_properties->st_dev != jng_properties->st_dev) ||
- (color_properties->st_ino != jng_properties->st_ino))
- {
- jng_image=DestroyImageList(jng_image);
- DestroyJNG(NULL,NULL,NULL,&alpha_image,&alpha_image_info);
- ThrowReaderException(PolicyError,"NotAuthorized");
- }
- }
(void) RelinquishUniqueFileResource(color_image->filename);
color_image=DestroyImageList(color_image);
color_image_info=DestroyImageInfo(color_image_info);