Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
automerge: 5ff6057

* commit '5ff6057bd32737c808f978eae6c100ffa24148d1':
  AudioRecorder read buffer overflow
This commit is contained in:
Eric Laurent
2014-11-14 21:41:15 +00:00
committed by android-build-merger
parent c990660771 5ff6057bd3
commit 8c8b919564
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android_media_AudioRecord.cpp
View File

@@ -431,7 +431,7 @@ static jint android_media_AudioRecord_readInShortArray(JNIEnv *env, jobject thi
// read the new audio data from the native AudioRecord object // read the new audio data from the native AudioRecord object
const size_t recorderBuffSize = lpRecorder->frameCount()*lpRecorder->frameSize(); const size_t recorderBuffSize = lpRecorder->frameCount()*lpRecorder->frameSize();
const size_t sizeInBytes = sizeInShorts * sizeof(short); 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 ? sizeInBytes > recorderBuffSize ?
recorderBuffSize : sizeInBytes); recorderBuffSize : sizeInBytes);