MDL-15919 minor tmpfile cleanup fixes

diff --git a/lib/file/file_packer.php b/lib/file/file_packer.php
index a3b90c8f0536498c6ec9d16e2983fb11ff3b3b9b..f5ef80df5f2a1e97af088e1ff063eb7b18f47476 100644 (file)
--- a/lib/file/file_packer.php
+++ b/lib/file/file_packer.php
@@ -211,10 +211,12 @@ class file_packer {
                 // large file, would not fit into memory :-(
                 $tmpfile = tempnam($CFG->dataroot.'/temp/unzip', 'largefile');
                 if (!$fp = fopen($tmpfile, 'wb')) {
+                    @unlink($tmpfile);
                     $processed[$name] = 'Can not write temp file'; // TODO: localise
                     continue;
                 }
                 if (!$fz = $zip->getStream($index['name'])) {
+                    @unlink($tmpfile);
                     $processed[$name] = 'Can not read file from zip archive'; // TODO: localise
                     continue;
                 }
@@ -233,6 +235,7 @@ class file_packer {
 
                 if ($file = $fs->get_file($contextid, $filearea, $itemid, $filepath, $filename)) {
                     if (!$file->delete()) {
+                        @unlink($tmpfile);
                         $processed[$name] = 'Can not delete existing file'; // TODO: localise
                         continue;
                     }