change close() to close_utf8()

Cristy · Cristy · commit 55d61bebae65 · 2026-02-20T20:29:42.000-05:00
diff --git a/coders/pdf.c b/coders/pdf.c
@@ -84,6 +84,7 @@
 #include "magick/token.h"
 #include "magick/transform.h"
 #include "magick/utility.h"
+#include "magick/utility-private.h"
 #include "coders/bytebuffer-private.h"
 #include "coders/ghostscript-private.h"
 
@@ -566,7 +567,7 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception)
     }
   if (write(file," ",1) != 1)
     { };
-  file=close(file)-1;
+  file=close_utf8(file)-1;
   /*
     Render Postscript with the Ghostscript delegate.
   */
diff --git a/coders/ps.c b/coders/ps.c
@@ -79,6 +79,7 @@
 #include "magick/token.h"
 #include "magick/transform.h"
 #include "magick/utility.h"
+#include "magick/utility-private.h"
 #include "coders/bytebuffer-private.h"
 #include "coders/ghostscript-private.h"
 
@@ -762,7 +763,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
         strlen(translate_geometry));
     }
   (void) count;
-  file=close(file)-1;
+  file=close_utf8(file)-1;
   /*
     Render Postscript with the Ghostscript delegate.
   */
diff --git a/coders/video.c b/coders/video.c
@@ -633,7 +633,7 @@ static MagickBooleanType WriteVIDEOImage(const ImageInfo *image_info,
     return(MagickFalse);
   file=AcquireUniqueFileResource(basename);
   if (file != -1)
-    file=close(file)-1;
+    file=close_utf8(file)-1;
   (void) FormatLocaleString(clone_images->filename,MagickPathExtent,"%s",
     basename);
   count=0;
diff --git a/magick/blob.c b/magick/blob.c
@@ -306,7 +306,7 @@ MagickExport MagickBooleanType BlobToFile(char *filename,const void *blob,
           break;
       }
   }
-  file=close(file);
+  file=close_utf8(file);
   if ((file == -1) || (i < length))
     {
       ThrowFileException(exception,BlobError,"UnableToWriteBlob",filename);
@@ -1229,7 +1229,7 @@ MagickExport unsigned char *FileToBlob(const char *filename,const size_t extent,
           break;
       }
       if (LocaleCompare(filename,"-") != 0)
-        file=close(file);
+        file=close_utf8(file);
       if (blob == (unsigned char *) NULL)
         {
           (void) ThrowMagickException(exception,GetMagickModule(),
@@ -1254,7 +1254,7 @@ MagickExport unsigned char *FileToBlob(const char *filename,const size_t extent,
       sizeof(*blob));
   if (blob == (unsigned char *) NULL)
     {
-      file=close(file);
+      file=close_utf8(file);
       (void) ThrowMagickException(exception,GetMagickModule(),
         ResourceLimitError,"MemoryAllocationFailed","`%s'",filename);
       return((unsigned char *) NULL);
@@ -1281,15 +1281,15 @@ MagickExport unsigned char *FileToBlob(const char *filename,const size_t extent,
       }
       if (i < *length)
         {
-          file=close(file)-1;
+          file=close_utf8(file)-1;
           blob=(unsigned char *) RelinquishMagickMemory(blob);
           ThrowFileException(exception,BlobError,"UnableToReadBlob",filename);
           return((unsigned char *) NULL);
         }
     }
   blob[*length]='\0';
   if (LocaleCompare(filename,"-") != 0)
-    file=close(file);
+    file=close_utf8(file);
   if (file == -1)
     {
       blob=(unsigned char *) RelinquishMagickMemory(blob);
@@ -1424,7 +1424,7 @@ MagickExport MagickBooleanType FileToImage(Image *image,const char *filename)
   blob=(unsigned char *) AcquireQuantumMemory(quantum,sizeof(*blob));
   if (blob == (unsigned char *) NULL)
     {
-      file=close(file);
+      file=close_utf8(file);
       ThrowFileException(&image->exception,ResourceLimitError,
         "MemoryAllocationFailed",filename);
       return(MagickFalse);
@@ -1447,7 +1447,7 @@ MagickExport MagickBooleanType FileToImage(Image *image,const char *filename)
         break;
       }
   }
-  file=close(file);
+  file=close_utf8(file);
   if (file == -1)
     ThrowFileException(&image->exception,BlobError,"UnableToWriteBlob",
       filename);
@@ -1955,7 +1955,7 @@ MagickExport MagickBooleanType ImageToFile(Image *image,char *filename,
   buffer=(unsigned char *) AcquireQuantumMemory(quantum,sizeof(*buffer));
   if (buffer == (unsigned char *) NULL)
     {
-      file=close(file)-1;
+      file=close_utf8(file)-1;
       (void) ThrowMagickException(exception,GetMagickModule(),
         ResourceLimitError,"MemoryAllocationError","`%s'",filename);
       return(MagickFalse);
@@ -1980,12 +1980,12 @@ MagickExport MagickBooleanType ImageToFile(Image *image,char *filename,
     p=(const unsigned char *) ReadBlobStream(image,quantum,buffer,&count);
   }
   if (LocaleCompare(filename,"-") != 0)
-    file=close(file);
+    file=close_utf8(file);
   buffer=(unsigned char *) RelinquishMagickMemory(buffer);
   if ((file == -1) || (i < length))
     {
       if (file != -1)
-        file=close(file);
+        file=close_utf8(file);
       ThrowFileException(exception,BlobError,"UnableToWriteBlob",filename);
       return(MagickFalse);
     }
@@ -2268,7 +2268,7 @@ MagickExport MagickBooleanType InjectImageBlob(const ImageInfo *image_info,
   if (buffer == (unsigned char *) NULL)
     {
       (void) RelinquishUniqueFileResource(filename);
-      file=close(file);
+      file=close_utf8(file);
       ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
         image->filename);
     }
@@ -2284,7 +2284,7 @@ MagickExport MagickBooleanType InjectImageBlob(const ImageInfo *image_info,
     status=WriteBlobStream(image,(size_t) count,buffer) == count ? MagickTrue :
       MagickFalse;
   }
-  file=close(file);
+  file=close_utf8(file);
   if (file == -1)
     ThrowFileException(exception,FileOpenError,"UnableToWriteBlob",filename);
   (void) RelinquishUniqueFileResource(filename);
diff --git a/magick/cache.c b/magick/cache.c
@@ -1115,7 +1115,7 @@ static MagickBooleanType ClosePixelCacheOnDisk(CacheInfo *cache_info)
   status=(-1);
   if (cache_info->file != -1)
     {
-      status=close(cache_info->file);
+      status=close_utf8(cache_info->file);
       cache_info->file=(-1);
       RelinquishMagickResource(FileResource,1);
     }
diff --git a/magick/display.c b/magick/display.c
@@ -8869,7 +8869,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info,
         }
       value=GetImageProperty(*image,"comment");
       if (value == (char *) NULL)
-        unique_file=close(unique_file)-1;
+        unique_file=close_utf8(unique_file)-1;
       else
         {
           const char
diff --git a/magick/effect.c b/magick/effect.c
@@ -90,6 +90,7 @@
 #include "magick/thread-private.h"
 #include "magick/transform.h"
 #include "magick/threshold.h"
+#include "magick/utility-private.h"
 
 #ifdef MAGICKCORE_CLPERFMARKER
 #include "CLPerfMarker.h"
@@ -3211,7 +3212,7 @@ MagickExport Image *PreviewImage(const Image *image,const PreviewType preview,
           preview_info->quality);
         file=AcquireUniqueFileResource(filename);
         if (file != -1)
-          file=close(file)-1;
+          file=close_utf8(file)-1;
         (void) FormatLocaleString(preview_image->filename,MaxTextExtent,
           "jpeg:%s",filename);
         status=WriteImage(preview_info,preview_image);
diff --git a/magick/opencl.c b/magick/opencl.c
@@ -941,7 +941,7 @@ static void saveBinaryCLProgram(MagickCLEnv clEnv,MagickOpenCLProgram prog,
             if (file != -1)
               {
                 write(file,binary_program[i],program_size);
-                file=close(file);
+                file=close_utf8(file);
               }
             else
               (void) ThrowMagickException(exception,GetMagickModule(),
diff --git a/magick/string.c b/magick/string.c
@@ -629,7 +629,7 @@ MagickExport StringInfo *ConfigureFileToStringInfo(const char *filename)
   offset=(MagickOffsetType) lseek(file,0,SEEK_END);
   if ((offset < 0) || (offset != (MagickOffsetType) ((ssize_t) offset)))
     {
-      file=close(file)-1;
+      file=close_utf8(file)-1;
       return((StringInfo *) NULL);
     }
   length=(size_t) offset;
@@ -638,7 +638,7 @@ MagickExport StringInfo *ConfigureFileToStringInfo(const char *filename)
     string=(char *) AcquireQuantumMemory(length+MaxTextExtent,sizeof(*string));
   if (string == (char *) NULL)
     {
-      file=close(file)-1;
+      file=close_utf8(file)-1;
       return((StringInfo *) NULL);
     }
   map=MapBlob(file,ReadMode,0,length);
@@ -669,13 +669,13 @@ MagickExport StringInfo *ConfigureFileToStringInfo(const char *filename)
       }
       if (i < length)
         {
-          file=close(file)-1;
+          file=close_utf8(file)-1;
           string=DestroyString(string);
           return((StringInfo *) NULL);
         }
     }
   string[length]='\0';
-  file=close(file)-1;
+  file=close_utf8(file)-1;
   string_info=AcquireStringInfoContainer();
   (void) CopyMagickString(string_info->path,filename,MaxTextExtent);
   string_info->length=length;
diff --git a/magick/utility-private.h b/magick/utility-private.h
@@ -55,6 +55,12 @@ static inline int access_utf8(const char *path,int mode)
 #endif
 }
 
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__)
+#define close_utf8 _close
+#else
+#define close_utf8 close
+#endif
+
 static inline FILE *fopen_utf8(const char *path,const char *mode)
 {
 #if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__)
diff --git a/magick/utility.c b/magick/utility.c
@@ -114,7 +114,7 @@ MagickExport MagickBooleanType AcquireUniqueFilename(char *path)
   file=AcquireUniqueFileResource(path);
   if (file == -1)
     return(MagickFalse);
-  file=close(file)-1;
+  file=close_utf8(file)-1;
   return(MagickTrue);
 }
 
@@ -1965,6 +1965,6 @@ MagickPrivate MagickBooleanType ShredFile(const char *path)
   }
   key=DestroyStringInfo(key);
   random_info=DestroyRandomInfo(random_info);
-  status=close(file);
+  status=close_utf8(file);
   return((status == -1 || i < passes) ? MagickFalse : MagickTrue);
 }
diff --git a/magick/xml-tree.c b/magick/xml-tree.c
@@ -656,7 +656,7 @@ MagickPrivate char *FileToXML(const char *filename,const size_t extent)
           break;
       }
       if (LocaleCompare(filename,"-") != 0)
-        file=close(file);
+        file=close_utf8(file);
       if (xml == (char *) NULL)
         return((char *) NULL);
       if (file == -1)
@@ -674,7 +674,7 @@ MagickPrivate char *FileToXML(const char *filename,const size_t extent)
     xml=(char *) AcquireQuantumMemory(length+MaxTextExtent,sizeof(*xml));
   if (xml == (char *) NULL)
     {
-      file=close(file);
+      file=close_utf8(file);
       return((char *) NULL);
     }
   map=MapBlob(file,ReadMode,0,length);
@@ -698,14 +698,14 @@ MagickPrivate char *FileToXML(const char *filename,const size_t extent)
       }
       if (i < length)
         {
-          file=close(file)-1;
+          file=close_utf8(file)-1;
           xml=(char *) RelinquishMagickMemory(xml);
           return((char *) NULL);
         }
     }
   xml[length]='\0';
   if (LocaleCompare(filename,"-") != 0)
-    file=close(file);
+    file=close_utf8(file);
   if (file == -1)
     xml=(char *) RelinquishMagickMemory(xml);
   return(xml);

Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ MagickExport MagickBooleanType BlobToFile(char filename,const void blob,`
`306`	`306`	`break;`
`307`	`307`	`}`
`308`	`308`	`}`
`309`		`- file=close(file);`
	`309`	`+ file=close_utf8(file);`
`310`	`310`	`if ((file == -1) \|\| (i < length))`
`311`	`311`	`{`
`312`	`312`	`ThrowFileException(exception,BlobError,"UnableToWriteBlob",filename);`
`@@ -1229,7 +1229,7 @@ MagickExport unsigned char FileToBlob(const char filename,const size_t extent,`
`1229`	`1229`	`break;`
`1230`	`1230`	`}`
`1231`	`1231`	`if (LocaleCompare(filename,"-") != 0)`
`1232`		`- file=close(file);`
	`1232`	`+ file=close_utf8(file);`
`1233`	`1233`	`if (blob == (unsigned char *) NULL)`
`1234`	`1234`	`{`
`1235`	`1235`	`(void) ThrowMagickException(exception,GetMagickModule(),`
`@@ -1254,7 +1254,7 @@ MagickExport unsigned char FileToBlob(const char filename,const size_t extent,`
`1254`	`1254`	`sizeof(*blob));`
`1255`	`1255`	`if (blob == (unsigned char *) NULL)`
`1256`	`1256`	`{`
`1257`		`- file=close(file);`
	`1257`	`+ file=close_utf8(file);`
`1258`	`1258`	`(void) ThrowMagickException(exception,GetMagickModule(),`
`1259`	`1259`	ResourceLimitError,"MemoryAllocationFailed","`%s'",filename);
`1260`	`1260`	`return((unsigned char *) NULL);`
`@@ -1281,15 +1281,15 @@ MagickExport unsigned char FileToBlob(const char filename,const size_t extent,`
`1281`	`1281`	`}`
`1282`	`1282`	`if (i < *length)`
`1283`	`1283`	`{`
`1284`		`- file=close(file)-1;`
	`1284`	`+ file=close_utf8(file)-1;`
`1285`	`1285`	`blob=(unsigned char *) RelinquishMagickMemory(blob);`
`1286`	`1286`	`ThrowFileException(exception,BlobError,"UnableToReadBlob",filename);`
`1287`	`1287`	`return((unsigned char *) NULL);`
`1288`	`1288`	`}`
`1289`	`1289`	`}`
`1290`	`1290`	`blob[*length]='\0';`
`1291`	`1291`	`if (LocaleCompare(filename,"-") != 0)`
`1292`		`- file=close(file);`
	`1292`	`+ file=close_utf8(file);`
`1293`	`1293`	`if (file == -1)`
`1294`	`1294`	`{`
`1295`	`1295`	`blob=(unsigned char *) RelinquishMagickMemory(blob);`
`@@ -1424,7 +1424,7 @@ MagickExport MagickBooleanType FileToImage(Image image,const char filename)`
`1424`	`1424`	`blob=(unsigned char ) AcquireQuantumMemory(quantum,sizeof(blob));`
`1425`	`1425`	`if (blob == (unsigned char *) NULL)`
`1426`	`1426`	`{`
`1427`		`- file=close(file);`
	`1427`	`+ file=close_utf8(file);`
`1428`	`1428`	`ThrowFileException(&image->exception,ResourceLimitError,`
`1429`	`1429`	`"MemoryAllocationFailed",filename);`
`1430`	`1430`	`return(MagickFalse);`
`@@ -1447,7 +1447,7 @@ MagickExport MagickBooleanType FileToImage(Image image,const char filename)`
`1447`	`1447`	`break;`
`1448`	`1448`	`}`
`1449`	`1449`	`}`
`1450`		`- file=close(file);`
	`1450`	`+ file=close_utf8(file);`
`1451`	`1451`	`if (file == -1)`
`1452`	`1452`	`ThrowFileException(&image->exception,BlobError,"UnableToWriteBlob",`
`1453`	`1453`	`filename);`
`@@ -1955,7 +1955,7 @@ MagickExport MagickBooleanType ImageToFile(Image image,char filename,`
`1955`	`1955`	`buffer=(unsigned char ) AcquireQuantumMemory(quantum,sizeof(buffer));`
`1956`	`1956`	`if (buffer == (unsigned char *) NULL)`
`1957`	`1957`	`{`
`1958`		`- file=close(file)-1;`
	`1958`	`+ file=close_utf8(file)-1;`
`1959`	`1959`	`(void) ThrowMagickException(exception,GetMagickModule(),`
`1960`	`1960`	ResourceLimitError,"MemoryAllocationError","`%s'",filename);
`1961`	`1961`	`return(MagickFalse);`
`@@ -1980,12 +1980,12 @@ MagickExport MagickBooleanType ImageToFile(Image image,char filename,`
`1980`	`1980`	`p=(const unsigned char *) ReadBlobStream(image,quantum,buffer,&count);`
`1981`	`1981`	`}`
`1982`	`1982`	`if (LocaleCompare(filename,"-") != 0)`
`1983`		`- file=close(file);`
	`1983`	`+ file=close_utf8(file);`
`1984`	`1984`	`buffer=(unsigned char *) RelinquishMagickMemory(buffer);`
`1985`	`1985`	`if ((file == -1) \|\| (i < length))`
`1986`	`1986`	`{`
`1987`	`1987`	`if (file != -1)`
`1988`		`- file=close(file);`
	`1988`	`+ file=close_utf8(file);`
`1989`	`1989`	`ThrowFileException(exception,BlobError,"UnableToWriteBlob",filename);`
`1990`	`1990`	`return(MagickFalse);`
`1991`	`1991`	`}`
`@@ -2268,7 +2268,7 @@ MagickExport MagickBooleanType InjectImageBlob(const ImageInfo *image_info,`
`2268`	`2268`	`if (buffer == (unsigned char *) NULL)`
`2269`	`2269`	`{`
`2270`	`2270`	`(void) RelinquishUniqueFileResource(filename);`
`2271`		`- file=close(file);`
	`2271`	`+ file=close_utf8(file);`
`2272`	`2272`	`ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",`
`2273`	`2273`	`image->filename);`
`2274`	`2274`	`}`
`@@ -2284,7 +2284,7 @@ MagickExport MagickBooleanType InjectImageBlob(const ImageInfo *image_info,`
`2284`	`2284`	`status=WriteBlobStream(image,(size_t) count,buffer) == count ? MagickTrue :`
`2285`	`2285`	`MagickFalse;`
`2286`	`2286`	`}`
`2287`		`- file=close(file);`
	`2287`	`+ file=close_utf8(file);`
`2288`	`2288`	`if (file == -1)`
`2289`	`2289`	`ThrowFileException(exception,FileOpenError,"UnableToWriteBlob",filename);`
`2290`	`2290`	`(void) RelinquishUniqueFileResource(filename);`
Original file line number	Diff line number	Diff line change
`@@ -1115,7 +1115,7 @@ static MagickBooleanType ClosePixelCacheOnDisk(CacheInfo *cache_info)`
`1115`	`1115`	`status=(-1);`
`1116`	`1116`	`if (cache_info->file != -1)`
`1117`	`1117`	`{`
`1118`		`- status=close(cache_info->file);`
	`1118`	`+ status=close_utf8(cache_info->file);`
`1119`	`1119`	`cache_info->file=(-1);`
`1120`	`1120`	`RelinquishMagickResource(FileResource,1);`
`1121`	`1121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8869,7 +8869,7 @@ static Image XMagickCommand(Display display,XResourceInfo *resource_info,`
`8869`	`8869`	`}`
`8870`	`8870`	`value=GetImageProperty(*image,"comment");`
`8871`	`8871`	`if (value == (char *) NULL)`
`8872`		`- unique_file=close(unique_file)-1;`
	`8872`	`+ unique_file=close_utf8(unique_file)-1;`
`8873`	`8873`	`else`
`8874`	`8874`	`{`
`8875`	`8875`	`const char`
Original file line number	Diff line number	Diff line change
`@@ -941,7 +941,7 @@ static void saveBinaryCLProgram(MagickCLEnv clEnv,MagickOpenCLProgram prog,`
`941`	`941`	`if (file != -1)`
`942`	`942`	`{`
`943`	`943`	`write(file,binary_program[i],program_size);`
`944`		`- file=close(file);`
	`944`	`+ file=close_utf8(file);`
`945`	`945`	`}`
`946`	`946`	`else`
`947`	`947`	`(void) ThrowMagickException(exception,GetMagickModule(),`
Original file line number	Diff line number	Diff line change
`@@ -629,7 +629,7 @@ MagickExport StringInfo ConfigureFileToStringInfo(const char filename)`
`629`	`629`	`offset=(MagickOffsetType) lseek(file,0,SEEK_END);`
`630`	`630`	`if ((offset < 0) \|\| (offset != (MagickOffsetType) ((ssize_t) offset)))`
`631`	`631`	`{`
`632`		`- file=close(file)-1;`
	`632`	`+ file=close_utf8(file)-1;`
`633`	`633`	`return((StringInfo *) NULL);`
`634`	`634`	`}`
`635`	`635`	`length=(size_t) offset;`
`@@ -638,7 +638,7 @@ MagickExport StringInfo ConfigureFileToStringInfo(const char filename)`
`638`	`638`	`string=(char ) AcquireQuantumMemory(length+MaxTextExtent,sizeof(string));`
`639`	`639`	`if (string == (char *) NULL)`
`640`	`640`	`{`
`641`		`- file=close(file)-1;`
	`641`	`+ file=close_utf8(file)-1;`
`642`	`642`	`return((StringInfo *) NULL);`
`643`	`643`	`}`
`644`	`644`	`map=MapBlob(file,ReadMode,0,length);`
`@@ -669,13 +669,13 @@ MagickExport StringInfo ConfigureFileToStringInfo(const char filename)`
`669`	`669`	`}`
`670`	`670`	`if (i < length)`
`671`	`671`	`{`
`672`		`- file=close(file)-1;`
	`672`	`+ file=close_utf8(file)-1;`
`673`	`673`	`string=DestroyString(string);`
`674`	`674`	`return((StringInfo *) NULL);`
`675`	`675`	`}`
`676`	`676`	`}`
`677`	`677`	`string[length]='\0';`
`678`		`- file=close(file)-1;`
	`678`	`+ file=close_utf8(file)-1;`
`679`	`679`	`string_info=AcquireStringInfoContainer();`
`680`	`680`	`(void) CopyMagickString(string_info->path,filename,MaxTextExtent);`
`681`	`681`	`string_info->length=length;`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,12 @@ static inline int access_utf8(const char *path,int mode)`
`55`	`55`	`#endif`
`56`	`56`	`}`
`57`	`57`
	`58`	`+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__)`
	`59`	`+#define close_utf8 _close`
	`60`	`+#else`
	`61`	`+#define close_utf8 close`
	`62`	`+#endif`
	`63`	`+`
`58`	`64`	`static inline FILE fopen_utf8(const char path,const char *mode)`
`59`	`65`	`{`
`60`	`66`	`#if !defined(MAGICKCORE_WINDOWS_SUPPORT) \|\| defined(__CYGWIN__)`