Fixed bug temp zip file writing

querytechnology · May 8, 2020 · 44aec2e · 44aec2e
1 parent fbcd4ac
commit 44aec2e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/bin/tqc.phar b/bin/tqc.phar
diff --git a/src/TinyQueries/Compiler.php b/src/TinyQueries/Compiler.php
@@ -128,8 +128,7 @@ public function compile(array $config, string $apiKey, bool $verbose = false)
         }
 
         $zip = new \ZipArchive();
-        $tag = md5(rand());
-        $zipFileName = 'upload-' . $tag . '.zip';
+        $zipFileName = tempnam(sys_get_temp_dir(), 'tq-');
 
         if ($zip->open($zipFileName, \ZipArchive::CREATE)!==true) {
             throw new \Exception("Cannot open $zipFileName");
@@ -143,7 +142,11 @@ public function compile(array $config, string $apiKey, bool $verbose = false)
 
         self::addFolderRecursivelyToZip($zip, $config['compiler']['input']);
 
-        $zip->close();
+        $r = $zip->close();
+
+        if ($r !== true) {
+            throw new \Exception('Could not create zip file for upload ' . $zipFileName);
+        }
 
         $postBody = [
             'tq_code' => curl_file_create(realpath($zipFileName)),
@@ -197,8 +200,10 @@ public function compile(array $config, string $apiKey, bool $verbose = false)
         }
 
         $zip = new \ZipArchive();
-        $zipFileName = 'download-' . $tag . '.zip';
-        file_put_contents($zipFileName, $response[1]);
+        $r = file_put_contents($zipFileName, $response[1]);
+        if ($r === false) {
+            throw new \Exception('Error writing downloaded zip ' . $zipFileName);
+        }
         $r = $zip->open($zipFileName);
         if ($r !== true) {
             throw new \Exception('Error opening ZIP coming from compiler - error code = ' . $r);