[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-5' - common/FileUtil.cpp

[Michael Meeks (via logerrit)]

 common/FileUtil.cpp |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 0fdcd22117046df7f4867dffe460d9833b6d912e
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Tue Jun 30 16:40:53 2020 +0100
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Wed Jul 1 00:05:41 2020 +0200

    Close files after copying, to avoid fd leak during convert-to.
    
    Change-Id: I24a9726bfea7805aff61d778e9f8f91c5b1ffd52
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97508
    Tested-by: Aron Budea <aron.budea at collabora.com>
    Reviewed-by: Aron Budea <aron.budea at collabora.com>

diff --git a/common/FileUtil.cpp b/common/FileUtil.cpp
index 793fc1e25..4d8ac0a56 100644
--- a/common/FileUtil.cpp
+++ b/common/FileUtil.cpp
@@ -145,6 +145,8 @@ namespace FileUtil
                 LOG_WRN("Unusual: file " << anonymizeUrl(fromPath) << " changed size "
                         "during copy from " << st.st_size << " to " << bytesIn);
             }
+            close(from);
+            close(to);
         }
         catch (...)
         {