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

Commit 3330d120 authored by Josh Gao's avatar Josh Gao
Browse files

statsd: fix double close. 

Previously, fdopen was being called on a file descriptor that was owned
by a unique_fd without releasing. This leads to a double close, since
both fclose and the unique_fd destructor will try to close the fd.

Bug: http://b/113880863
Test: treehugger
Change-Id: I6f6f48d304861b5e4d7efee0d3ad0e30178a95a4
parent 608fa51d

cmds/statsd/src/external/Perfetto.cpp

+2 −2
Original line number Diff line number Diff line
@@ -105,9 +105,9 @@ bool CollectPerfettoTraceAndUploadToDropbox(const PerfettoDetails& config, 


    readPipe.reset();  // Close the read end (owned by the child process).



    // Using fopen() because fwrite() has the right logic to chunking write()

    // Using fdopen() because fwrite() has the right logic to chunking write()

    // over a pipe (see __sfvwrite()).

    FILE* writePipeStream = fdopen(writePipe.get(), "wb");

    FILE* writePipeStream = android::base::Fdopen(std::move(writePipe), "wb");

    if (!writePipeStream) {

        ALOGE("fdopen() failed while calling the Perfetto client: %s", strerror(errno));

        return false;