Check for non-negative fd before close, dup, lseek, or read. (b20688e7) · Commits · e / os / android_frameworks_av

media/libmedia/MidiIoWrapper.cpp

+8 −2

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ MidiIoWrapper::MidiIoWrapper(const char *path) {

		MidiIoWrapper::MidiIoWrapper(int fd, off64_t offset, int64_t size) {
		ALOGV("MidiIoWrapper(fd=%d)", fd);
		mFd = dup(fd);
		mFd = fd < 0 ? -1 : dup(fd);
		mBase = offset;
		mLength = size;
		}
		@@ -61,8 +61,10 @@ MidiIoWrapper::MidiIoWrapper(const sp<DataSource> &source) {

		MidiIoWrapper::~MidiIoWrapper() {
		ALOGV("~MidiIoWrapper");
		if (mFd >= 0) {
		close(mFd);
		}
		}

		int MidiIoWrapper::readAt(void *buffer, int offset, int size) {
		ALOGV("readAt(%p, %d, %d)", buffer, offset, size);
		@@ -70,6 +72,10 @@ int MidiIoWrapper::readAt(void *buffer, int offset, int size) {
		if (mDataSource != NULL) {
		return mDataSource->readAt(offset, buffer, size);
		}
		if (mFd < 0) {
		errno = EBADF;
		return -1; // as per failed read.
		}
		lseek(mFd, mBase + offset, SEEK_SET);
		if (offset + size > mLength) {
		size = mLength - offset;