i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SoundFile.cpp: do a NULL check before deferencing.

Browse Source 
CID 296.
This commit is contained in:
Philippe Saint-Pierre
2012-01-02 14:26:07 -05:00
parent e9132cc34c
commit 9e4224613c
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/media/SoundFile.cpp
+5 -1
View File
@@ -310,7 +310,7 @@ status_t
BSoundFile::_ref_to_file(const entry_ref *ref) BSoundFile::_ref_to_file(const entry_ref *ref)
{ {
status_t status; status_t status;
BFile * file = new BFile(ref,B_READ_ONLY); BFile * file = new BFile(ref, B_READ_ONLY);
status = file->InitCheck(); status = file->InitCheck();
if (status != B_OK) { if (status != B_OK) {
fSoundFile = file; fSoundFile = file;
@@ -360,6 +360,10 @@ BSoundFile::_ref_to_file(const entry_ref *ref)
if (mf.type == B_MEDIA_RAW_AUDIO) { if (mf.type == B_MEDIA_RAW_AUDIO) {
raw = &mf.u.raw_audio; raw = &mf.u.raw_audio;
} }
if (raw == NULL)
return B_ERROR;
fSamplingRate = (int)raw->frame_rate; fSamplingRate = (int)raw->frame_rate;
fChannelCount = raw->channel_count; fChannelCount = raw->channel_count;
fSampleSize = raw->format & 0xf; fSampleSize = raw->format & 0xf;