Bug#591396: mpc123: uninitialized pointer

[Colin Watson <cjwatson@debian.org>]

On Mon, Aug 02, 2010 at 09:12:05PM +0200, Pawel wrote:
> ~$ mpc123 file.mpc
> ao_oss ERROR: Unrecognized channel name "....." in channel matrix "...."
> ao_oss WARNING: Input channel matrix invalid; ignoring.
> ~$
> 
> 
> 
> ------------- CUT ------------------
> 
> --- mpc123-0.2.4.org//ao.c      2010-08-02 20:29:04.000000000 +0200
> +++ mpc123-0.2.4/ao.c   2010-08-02 20:35:44.000000000 +0200
> @@ -127,6 +127,7 @@ int mpc123_ao_init(void ** d, mpc_stream
>    ao_fmt.rate=streaminfo->sample_freq;
>    ao_fmt.channels=streaminfo->channels;
>    ao_fmt.byte_format=AO_FMT_LITTLE;
> +  ao_fmt.matrix=NULL;
> 
>    /* output audio params */
>    debugf("<ao_fmt> bits = %d", ao_fmt.bits);
> 
> ------------- CUT ------------------

Thanks for your patch.  I'm taking a slightly different approach for my
QA upload to avoid requiring libao 1.0.0 and to future-proof against
further additions to this structure, though:

--- a/ao.c
+++ b/ao.c
@@ -123,6 +123,7 @@
 
   /* initialize ao_format struct */
   /* XXX VERY WRONG */
+  memset(&ao_fmt, 0, sizeof(ao_fmt));
   ao_fmt.bits=16;       /*tmp_stream_info.average_bitrate;*/
   ao_fmt.rate=streaminfo->sample_freq;
   ao_fmt.channels=streaminfo->channels;

Cheers,

-- 
Colin Watson                                       [cjwatson@debian.org]