diff options
| author | Reilly Grant <reillyeon@qotw.net> | 2011-12-05 18:05:42 -0800 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-08-31 18:34:02 +0200 |
| commit | f285572102540fde7dcfaa009a34fb0d6822132f (patch) | |
| tree | f5de4d79882845521bbefb57bc9252e451dcaad5 | |
| parent | 59de61e5b5b960ec979c0ff4ede72cdc28a2d424 (diff) | |
| download | alsa-lib-f285572102540fde7dcfaa009a34fb0d6822132f.tar.gz | |
PCM: plug: Move fast_ops copy after slave configuration.
This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
The plug plugin copies the fast_ops structure and fast_op_arg from its
slave PCM on initialization and after inserting a new plugin. This works
unless the slave PCM is also an instance of the plug plugin because plug
can change its fast_ops structure during _snd_pcm_hw_params.
Instead of copying fast_ops in snd_pcm_plug_insert_plugins wait until
the end of snd_pcm_plug_hw_params when the slave has been fully
initialized.
This fixes a crash when two instances of plug are instantiated back to
back and the format conversion plugin inserted by the second is skipped
by the first because the fast_ops pointer is not properly updated.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | src/pcm/pcm_plug.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/pcm/pcm_plug.c b/src/pcm/pcm_plug.c index e9d29236..72456d5a 100644 --- a/src/pcm/pcm_plug.c +++ b/src/pcm/pcm_plug.c @@ -659,8 +659,6 @@ static int snd_pcm_plug_insert_plugins(snd_pcm_t *pcm, } if (err) { plug->gen.slave = new; - pcm->fast_ops = new->fast_ops; - pcm->fast_op_arg = new->fast_op_arg; } k++; } @@ -1049,6 +1047,9 @@ static int snd_pcm_plug_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t *params) } snd_pcm_unlink_hw_ptr(pcm, plug->req_slave); snd_pcm_unlink_appl_ptr(pcm, plug->req_slave); + + pcm->fast_ops = slave->fast_ops; + pcm->fast_op_arg = slave->fast_op_arg; snd_pcm_link_hw_ptr(pcm, slave); snd_pcm_link_appl_ptr(pcm, slave); return 0; |