#2226 Ensure to close files

TheHive-Project · Oct 26, 2021 · d9bfdb4 · d9bfdb4
1 parent c7a446d
commit d9bfdb4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/ScalliGraph b/ScalliGraph
diff --git a/thehive/app/org/thp/thehive/services/AttachmentSrv.scala b/thehive/app/org/thp/thehive/services/AttachmentSrv.scala
@@ -33,12 +33,10 @@ class AttachmentSrv @Inject() (configuration: Configuration, storageSrv: Storage
     val hs = hashers.fromPath(file.filepath)
     val id = hs.head.toString
     val is = Files.newInputStream(file.filepath)
-    val result =
-      storageSrv
-        .saveBinary("attachment", id, is)
-        .flatMap(_ => createEntity(Attachment(file.filename, Files.size(file.filepath), file.contentType, hs, id)))
-    is.close()
-    result
+    try storageSrv
+      .saveBinary("attachment", id, is)
+      .flatMap(_ => createEntity(Attachment(file.filename, Files.size(file.filepath), file.contentType, hs, id)))
+    finally is.close()
   }
 
   def create(filename: String, contentType: String, data: Array[Byte])(implicit