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

Commit 83422197 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "Fix pipe fds leak in copyInternalSpliceSocket" into main am: b6c0fa01 am: 7b09c7f3 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3111727



Change-Id: Ic8dcd026e0094195045efec7a50b933a4a747161
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9b212379 7b09c7f3

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;

    }