commit b6c0fa01335a176bf1cce986cfaadfc1b3667d53
author Steven Moreland <smoreland@google.com> Fri Jun 07 00:35:05 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 07 00:35:05 2024 +0000
tree feaecb7a79b4d8805fe48a997b5d46f3064770df
parent 50447cd83176162c051bf361dbee8e4121f46c47
parent df29b7fe3ac149674027b61ee3664bdc8a3af1c7

Merge "Fix pipe fds leak in copyInternalSpliceSocket" into main

core/java/android/os/FileUtils.java

diff --git a/core/java/android/os/FileUtils.java b/core/java/android/os/FileUtils.java
index 4dc32d5..f3d743d 100644
--- a/core/java/android/os/FileUtils.java
+++ b/core/java/android/os/FileUtils.java
@@ -580,6 +580,8 @@
                            ", copied:" + progress +
                            ", read:" + (count - countToRead) +
                            ", in pipe: " + countInPipe);
+                    Os.close(pipes[0]);
+                    Os.close(pipes[1]);
                     throw new ErrnoException("splice, pipe --> fdOut", EIO);
                 } else {
                     progress += t;
@@ -607,6 +609,8 @@
                 listener.onProgress(progressSnapshot);
             });
         }
+        Os.close(pipes[0]);
+        Os.close(pipes[1]);
         return progress;
     }