authorChristopher Brannon <[email protected]>2011-02-13 01:37:28 (GMT)
committer Max Kellermann <[email protected]>2011-02-15 11:16:25 (GMT)
commit2a1f4539f6115f6d01f33b60adf0118122c7018a (patch) (side-by-side diff)
parent03018611f8b9d7ed6d55ee45ccf2b69958c05caf (diff)
Insure proper initialization of stack-allocated struct.
Version 1.0.0 of the libao library added a new field to the ao_sample_format struct. It is a char * named matrix. When an ao_sample_format is allocated on the stack, this field contains garbage. The proper course is to insure that is initialized to NULL. NULL indicates that we do not want any mapping. The struct is now initialized using a static initializer, and this technique is compatible with all known versions of libao.
Diffstat (more/less context) (ignore whitespace changes)
2 files changed, 6 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 313a5c6..76571d0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
ver 0.15.16 (2010/??/??)
+* output:
+ - ao: initialize the ao_sample_format struct
* encoders:
- lame: explicitly configure the output sample rate
* update: log all file permission problems
diff --git a/src/output/ao_plugin.c b/src/output/ao_plugin.c
index 12d2b75..63a43dd 100644
--- a/src/output/ao_plugin.c
+++ b/src/output/ao_plugin.c
@@ -25,6 +25,9 @@
#define G_LOG_DOMAIN "ao"
+/* An ao_sample_format, with all fields set to zero: */
+static const ao_sample_format OUR_AO_FORMAT_INITIALIZER;
static unsigned ao_output_ref;
struct ao_data {
@@ -166,7 +169,7 @@ static bool
ao_output_open(void *data, struct audio_format *audio_format,
GError **error)
- ao_sample_format format;
+ ao_sample_format format = OUR_AO_FORMAT_INITIALIZER;
struct ao_data *ad = (struct ao_data *)data;
/* support for 24 bit samples in libao is currently dubious,