From 1740a1f20e5480b4039355fc79e579c9c60677b0 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Wed, 25 Dec 2019 15:22:54 +1100
Subject: [PATCH] Ensure tempfile is unlinked

---
 src/PIL/GifImagePlugin.py | 66 +++++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/PIL/GifImagePlugin.py b/src/PIL/GifImagePlugin.py
index 7717fc707..5f9ba59c1 100644
--- a/src/PIL/GifImagePlugin.py
+++ b/src/PIL/GifImagePlugin.py
@@ -616,38 +616,42 @@ def _save_netpbm(im, fp, filename):
     # below for information on how to enable this.
     tempfile = im._dump()
 
-    with open(filename, "wb") as f:
-        if im.mode != "RGB":
-            subprocess.check_call(
-                ["ppmtogif", tempfile], stdout=f, stderr=subprocess.DEVNULL
-            )
-        else:
-            # Pipe ppmquant output into ppmtogif
-            # "ppmquant 256 %s | ppmtogif > %s" % (tempfile, filename)
-            quant_cmd = ["ppmquant", "256", tempfile]
-            togif_cmd = ["ppmtogif"]
-            quant_proc = subprocess.Popen(
-                quant_cmd, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL
-            )
-            togif_proc = subprocess.Popen(
-                togif_cmd, stdin=quant_proc.stdout, stdout=f, stderr=subprocess.DEVNULL
-            )
-
-            # Allow ppmquant to receive SIGPIPE if ppmtogif exits
-            quant_proc.stdout.close()
-
-            retcode = quant_proc.wait()
-            if retcode:
-                raise subprocess.CalledProcessError(retcode, quant_cmd)
-
-            retcode = togif_proc.wait()
-            if retcode:
-                raise subprocess.CalledProcessError(retcode, togif_cmd)
-
     try:
-        os.unlink(tempfile)
-    except OSError:
-        pass
+        with open(filename, "wb") as f:
+            if im.mode != "RGB":
+                subprocess.check_call(
+                    ["ppmtogif", tempfile], stdout=f, stderr=subprocess.DEVNULL
+                )
+            else:
+                # Pipe ppmquant output into ppmtogif
+                # "ppmquant 256 %s | ppmtogif > %s" % (tempfile, filename)
+                quant_cmd = ["ppmquant", "256", tempfile]
+                togif_cmd = ["ppmtogif"]
+                quant_proc = subprocess.Popen(
+                    quant_cmd, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL
+                )
+                togif_proc = subprocess.Popen(
+                    togif_cmd,
+                    stdin=quant_proc.stdout,
+                    stdout=f,
+                    stderr=subprocess.DEVNULL,
+                )
+
+                # Allow ppmquant to receive SIGPIPE if ppmtogif exits
+                quant_proc.stdout.close()
+
+                retcode = quant_proc.wait()
+                if retcode:
+                    raise subprocess.CalledProcessError(retcode, quant_cmd)
+
+                retcode = togif_proc.wait()
+                if retcode:
+                    raise subprocess.CalledProcessError(retcode, togif_cmd)
+    finally:
+        try:
+            os.unlink(tempfile)
+        except OSError:
+            pass
 
 
 # Force optimization so that we can test performance against