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

Commit c46702cd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Guard against negative sizes from codec"

parents 23e03930 980f66ea

media/jni/soundpool/Sound.cpp

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static status_t decode(int fd, int64_t offset, int64_t length, 
                                __func__);

                        break;

                    }

                    const size_t dataSize = std::min((size_t)info.size, available);

                    const size_t dataSize = std::min(available, (size_t)std::max(info.size, 0));

                    memcpy(writePos, buf + info.offset, dataSize);

                    writePos += dataSize;

                    written += dataSize;