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

Commit 8c8b9195 authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

am 99253d00: Merge "AudioRecorder read buffer overflow" into lmp-mr1-dev 

automerge: 5ff6057b

* commit '5ff6057b':
  AudioRecorder read buffer overflow
parents c9906607 5ff6057b

core/jni/android_media_AudioRecord.cpp

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ static jint android_media_AudioRecord_readInShortArray(JNIEnv *env, jobject thi 
    // read the new audio data from the native AudioRecord object

    const size_t recorderBuffSize = lpRecorder->frameCount()*lpRecorder->frameSize();

    const size_t sizeInBytes = sizeInShorts * sizeof(short);

    ssize_t readSize = lpRecorder->read(recordBuff + offsetInShorts * sizeof(short),

    ssize_t readSize = lpRecorder->read(recordBuff + offsetInShorts,

                                        sizeInBytes > recorderBuffSize ?

                                            recorderBuffSize : sizeInBytes);