Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6c0fa01 authored by Steven Moreland's avatar Steven Moreland Committed by Gerrit Code Review
Browse files

Merge "Fix pipe fds leak in copyInternalSpliceSocket" into main

parents 50447cd8 df29b7fe

core/java/android/os/FileUtils.java

+4 −0
Original line number Diff line number Diff line
@@ -580,6 +580,8 @@ public final class FileUtils { 
                           ", 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 @@ public final class FileUtils { 
                listener.onProgress(progressSnapshot);

            });

        }

        Os.close(pipes[0]);

        Os.close(pipes[1]);

        return progress;

    }