Browse Source

Added some null pointer checks to createWriterFor methods

tags/2021-05-28
jules 9 years ago
parent
commit
3b881401f1
5 changed files with 11 additions and 4 deletions
  1. +1
    -1
      modules/juce_audio_formats/codecs/juce_AiffAudioFormat.cpp
  2. +1
    -1
      modules/juce_audio_formats/codecs/juce_FlacAudioFormat.cpp
  3. +3
    -0
      modules/juce_audio_formats/codecs/juce_LAMEEncoderAudioFormat.cpp
  4. +5
    -1
      modules/juce_audio_formats/codecs/juce_OggVorbisAudioFormat.cpp
  5. +1
    -1
      modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp

+ 1
- 1
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;


+ 1
- 1
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
- 0
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;


+ 5
- 1
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;
}


+ 1
- 1
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);


Loading…
Cancel
Save