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

Commit af8e8aa1 authored by Nick Kralevich's avatar Nick Kralevich
Browse files

Add mode when open(O_CREAT) is used. 

When creating a new file using open(..., O_CREAT), it is an error
to fail to specify a creation mode. If a mode is not specified, a
random stack provided value is used as the "mode".

This will become a compile error in a future Android change.

Change-Id: I36a3d67d294a915c1f79632a1b0ba45edd1214b1
parent 0dc6d5ef

media/libstagefright/AACWriter.cpp

+3 −1
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <media/stagefright/MetaData.h>

#include <media/mediarecorder.h>

#include <sys/prctl.h>

#include <sys/types.h>

#include <sys/stat.h>

#include <fcntl.h>



namespace android {
@@ -44,7 +46,7 @@ AACWriter::AACWriter(const char *filename) 


    ALOGV("AACWriter Constructor");



    mFd = open(filename, O_CREAT | O_LARGEFILE | O_TRUNC | O_RDWR);

    mFd = open(filename, O_CREAT | O_LARGEFILE | O_TRUNC | O_RDWR, S_IRUSR | S_IWUSR);

    if (mFd >= 0) {

        mInitCheck = OK;

    }

media/libstagefright/AMRWriter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ AMRWriter::AMRWriter(const char *filename) 
      mPaused(false),

      mResumed(false) {



    mFd = open(filename, O_CREAT | O_LARGEFILE | O_TRUNC | O_RDWR);

    mFd = open(filename, O_CREAT | O_LARGEFILE | O_TRUNC | O_RDWR, S_IRUSR | S_IWUSR);

    if (mFd >= 0) {

        mInitCheck = OK;

    }

media/libstagefright/MPEG4Writer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ MPEG4Writer::MPEG4Writer(const char *filename) 
      mAreGeoTagsAvailable(false),

      mStartTimeOffsetMs(-1) {



    mFd = open(filename, O_CREAT | O_LARGEFILE | O_TRUNC | O_RDWR);

    mFd = open(filename, O_CREAT | O_LARGEFILE | O_TRUNC | O_RDWR, S_IRUSR | S_IWUSR);

    if (mFd >= 0) {

        mInitCheck = OK;

    }

media/mtp/MtpDevice.cpp

+1 −1
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ fail: 
// reads the object's data and writes it to the specified file path

bool MtpDevice::readObject(MtpObjectHandle handle, const char* destPath, int group, int perm) {

    ALOGD("readObject: %s", destPath);

    int fd = ::open(destPath, O_RDWR | O_CREAT | O_TRUNC);

    int fd = ::open(destPath, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);

    if (fd < 0) {

        ALOGE("open failed for %s", destPath);

        return false;

media/mtp/MtpServer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ MtpResponseCode MtpServer::doSendObject() { 
    initialData = ret - MTP_CONTAINER_HEADER_SIZE;



    mtp_file_range  mfr;

    mfr.fd = open(mSendObjectFilePath, O_RDWR | O_CREAT | O_TRUNC);

    mfr.fd = open(mSendObjectFilePath, O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR);

    if (mfr.fd < 0) {

        result = MTP_RESPONSE_GENERAL_ERROR;

        goto done;