diff options
| author | Max Kellermann <max@duempel.org> | 2011-11-28 11:56:01 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-11-28 11:56:01 +0100 |
| commit | 4f093d5b979c3547c8dd8045dde5d91e8cc93461 (patch) | |
| tree | 94b1c12cfce14c90f26852e948ba419a8a7ba7eb /src/pcm_buffer.h | |
| parent | 37420c342bf9582a0de32d46f78716e913119400 (diff) | |
| parent | e1b032cbad5db7698104a93c2235fb7da1f8b580 (diff) | |
| download | mpd-4f093d5b979c3547c8dd8045dde5d91e8cc93461.tar.gz mpd-4f093d5b979c3547c8dd8045dde5d91e8cc93461.tar.xz mpd-4f093d5b979c3547c8dd8045dde5d91e8cc93461.zip | |
Merge branch 'v0.16.x'
Conflicts:
Makefile.am
NEWS
configure.ac
src/encoder/flac_encoder.c
src/log.c
src/pcm_buffer.c
Diffstat (limited to '')
| -rw-r--r-- | src/pcm_buffer.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/pcm_buffer.h b/src/pcm_buffer.h index 67973b750..502dd3db1 100644 --- a/src/pcm_buffer.h +++ b/src/pcm_buffer.h @@ -22,6 +22,8 @@ #include <glib.h> +#include <assert.h> + /** * Manager for a temporary buffer which grows as needed. We could * allocate a new buffer every time pcm_convert() is called, but that @@ -39,6 +41,8 @@ struct pcm_buffer { static inline void pcm_buffer_init(struct pcm_buffer *buffer) { + assert(buffer != NULL); + buffer->buffer = NULL; buffer->size = 0; } @@ -49,6 +53,8 @@ pcm_buffer_init(struct pcm_buffer *buffer) static inline void pcm_buffer_deinit(struct pcm_buffer *buffer) { + assert(buffer != NULL); + g_free(buffer->buffer); buffer->buffer = NULL; |