From feab11e9bdf2e95e590ab12cb4ec30232bdd1ed3 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Fri, 22 Jun 2012 08:39:20 +1000 Subject: [PATCH] Fix FLAC__stream_decoder_delete() and FLAC__stream_encoder_delete() so that they will simply return if passed a NULL pointer (ie just like the C free() stdlib function). --- src/libFLAC/stream_decoder.c | 4 +++- src/libFLAC/stream_encoder.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c index 5b3c3cd..ca4c185 100644 --- a/src/libFLAC/stream_decoder.c +++ b/src/libFLAC/stream_decoder.c @@ -332,7 +332,9 @@ FLAC_API void FLAC__stream_decoder_delete(FLAC__StreamDecoder *decoder) { unsigned i; - FLAC__ASSERT(0 != decoder); + if (decoder == NULL) + return ; + FLAC__ASSERT(0 != decoder->protected_); FLAC__ASSERT(0 != decoder->private_); FLAC__ASSERT(0 != decoder->private_->input); diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c index 7e102a5..c8d8adb 100644 --- a/src/libFLAC/stream_encoder.c +++ b/src/libFLAC/stream_encoder.c @@ -578,7 +578,9 @@ FLAC_API void FLAC__stream_encoder_delete(FLAC__StreamEncoder *encoder) { unsigned i; - FLAC__ASSERT(0 != encoder); + if (encoder == NULL) + return ; + FLAC__ASSERT(0 != encoder->protected_); FLAC__ASSERT(0 != encoder->private_); FLAC__ASSERT(0 != encoder->private_->frame); -- 2.7.4