From e0b406f6642c62c0d5f920d9053c440077fe83e7 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Sat, 23 Jan 2016 08:29:32 +1100 Subject: [PATCH] Fix three more cppcheck warnings * src/flac/vorbiscomment.c:203: Uninitialized variable: converted. * src/flac/vorbiscomment.c:210: Uninitialized variable: converted. * src/test_libFLAC++/decoders.cpp:507: Memory leak: decoder. --- src/flac/vorbiscomment.c | 2 +- src/test_libFLAC++/decoders.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/flac/vorbiscomment.c b/src/flac/vorbiscomment.c index 46e84045..182ef569 100644 --- a/src/flac/vorbiscomment.c +++ b/src/flac/vorbiscomment.c @@ -104,7 +104,7 @@ static FLAC__bool parse_vorbis_comment_field(const char *field_ref, char **field static FLAC__bool set_vc_field(FLAC__StreamMetadata *block, const Argument_VcField *field, FLAC__bool *needs_write, FLAC__bool raw, const char **violation) { FLAC__StreamMetadata_VorbisComment_Entry entry; - char *converted; + char *converted = NULL; FLAC__ASSERT(0 != block); FLAC__ASSERT(block->type == FLAC__METADATA_TYPE_VORBIS_COMMENT); diff --git a/src/test_libFLAC++/decoders.cpp b/src/test_libFLAC++/decoders.cpp index 3decc08d..14aa925e 100644 --- a/src/test_libFLAC++/decoders.cpp +++ b/src/test_libFLAC++/decoders.cpp @@ -504,6 +504,7 @@ static bool test_stream_decoder(Layer layer, bool is_ogg) break; default: die_("internal error 006"); + delete decoder; return false; } if(init_status != ::FLAC__STREAM_DECODER_INIT_STATUS_OK)