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.

Insure proper initialization of stack-allocated struct.
2a1f4539 · Christopher Brannon · Max Kellermann · 03018611 · 2a1f4539 · 2a1f4539
Commit 2a1f4539 authored Feb 13, 2011 by Christopher Brannon Committed by Max Kellermann Feb 15, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

NEWS NEWS +2 -0

ao_plugin.c src/output/ao_plugin.c +4 -1

No files found.
--- a/NEWS
+++ b/NEWS
 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

--- a/src/output/ao_plugin.c
+++ b/src/output/ao_plugin.c
@@ -25,6 +25,9 @@
 #undef G_LOG_DOMAIN
 #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,