mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Added some null pointer checks to createWriterFor methods

Browse source
This commit is contained in:
jules 2016-01-04 12:43:49 +00:00
parent 400cd0e3f4
commit 3b881401f1
5 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp
View file

@ -1003,7 +1003,7 @@ AudioFormatWriter* AiffAudioFormat::createWriterFor (OutputStream* out,
const StringPairArray& metadataValues,
int /*qualityOptionIndex*/)
{
if (getPossibleBitDepths().contains (bitsPerSample))
if (out != nullptr && getPossibleBitDepths().contains (bitsPerSample))
return new AiffAudioFormatWriter (out, sampleRate, numberOfChannels, (unsigned int) bitsPerSample, metadataValues);
return nullptr;

2
modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp
View file

@ -536,7 +536,7 @@ AudioFormatWriter* FlacAudioFormat::createWriterFor (OutputStream* out,
const StringPairArray& /*metadataValues*/,
int qualityOptionIndex)
{
if (getPossibleBitDepths().contains (bitsPerSample))
if (out != nullptr && getPossibleBitDepths().contains (bitsPerSample))
{
ScopedPointer<FlacWriter> w (new FlacWriter (out, sampleRate, numberOfChannels,
(uint32) bitsPerSample, qualityOptionIndex));

3
modules/juce_audio_formats/codecs/juce_LAMEEncoderAudioFormat.cpp
View file

@ -205,6 +205,9 @@ AudioFormatWriter* LAMEEncoderAudioFormat::createWriterFor (OutputStream* stream
const StringPairArray& metadataValues,
int qualityOptionIndex)
{
if (streamToWriteTo == nullptr)
return nullptr;
int vbr = 4;
int cbr = 0;

6
modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp
View file

@ -483,8 +483,12 @@ AudioFormatWriter* OggVorbisAudioFormat::createWriterFor (OutputStream* out,
const StringPairArray& metadataValues,
int qualityOptionIndex)
{
if (out == nullptr)
return nullptr;
ScopedPointer<OggWriter> w (new OggWriter (out, sampleRate, numChannels,
(unsigned int) bitsPerSample, qualityOptionIndex, metadataValues));
(unsigned int) bitsPerSample,
qualityOptionIndex, metadataValues));
return w->ok ? w.release() : nullptr;
}

2
modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp
View file

@ -1606,7 +1606,7 @@ AudioFormatWriter* WavAudioFormat::createWriterFor (OutputStream* out, double sa
unsigned int numChannels, int bitsPerSample,
const StringPairArray& metadataValues, int /*qualityOptionIndex*/)
{
if (getPossibleBitDepths().contains (bitsPerSample))
if (out != nullptr && getPossibleBitDepths().contains (bitsPerSample))
return new WavAudioFormatWriter (out, sampleRate, (unsigned int) numChannels,
(unsigned int) bitsPerSample, metadataValues);