diff options
| author | Zbigniew Mazur <zbigniew.mazur@sonyericsson.com> | 2012-10-11 13:56:41 +0200 |
|---|---|---|
| committer | Johan Redestig <johan.redestig@sonymobile.com> | 2012-11-23 09:49:30 +0100 |
| commit | 2b691b90507ec45a98636a855c46de5dbe27c84a (patch) | |
| tree | a74fbe1863be31bb94a90e89c2bfe6c32134e41c | |
| parent | 33cf49b168a88a88167c46b01787a57b49cd875f (diff) | |
AudioTrack::dump null mCblk check test
This fix is protecting AudioTrack::dump from SIGSEGEV
when calling dumpsys shell command.
Change-Id: I30d136e195a12d6fdad41e14f557b0ad9e59b8a2
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 362d0224..aec8c4a6 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -1441,7 +1441,7 @@ status_t AudioTrack::dump(int fd, const Vector<String16>& args) const result.append(" AudioTrack::dump\n"); snprintf(buffer, 255, " stream type(%d), left - right volume(%f, %f)\n", mStreamType, mVolume[0], mVolume[1]); result.append(buffer); - snprintf(buffer, 255, " format(%d), channel count(%d), frame count(%d)\n", mFormat, mChannelCount, mCblk->frameCount); + snprintf(buffer, 255, " format(%d), channel count(%d), frame count(%d)\n", mFormat, mChannelCount, (mCblk == 0) ? 0 : mCblk->frameCount); result.append(buffer); snprintf(buffer, 255, " sample rate(%d), status(%d), muted(%d)\n", (mCblk == 0) ? 0 : mCblk->sampleRate, mStatus, mMuted); result.append(buffer); |