Merge pull request #24277 from mi4r/dev/mi4r/ImagesImportFix

api: Move close function in condition body
containers · Nov 7, 2024 · f8ac02d · f8ac02d · packit-as-a-service · Nov 7, 2024
2 parents cbb5d7f + 9f5bbec
commit f8ac02d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go
@@ -403,14 +403,17 @@ func ImagesImport(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 		defer os.Remove(tmpfile.Name())
-		defer tmpfile.Close()
 
 		if _, err := io.Copy(tmpfile, r.Body); err != nil && err != io.EOF {
 			utils.Error(w, http.StatusInternalServerError, fmt.Errorf("unable to write archive to temporary file: %w", err))
+			tmpfile.Close()
 			return
 		}
 
-		tmpfile.Close()
+		if err := tmpfile.Close(); err != nil {
+			utils.Error(w, http.StatusInternalServerError, fmt.Errorf("unable to close tempfile: %w", err))
+			return
+		}
 		source = tmpfile.Name()
 	}