[pulseaudio-discuss] [PATCH 1/5] module-coreaudio-detect: fix pa__done()

[Colin Guthrie]

'Twas brillig, and Daniel Mack at 20/03/11 17:39 did gyre and gimble:
> From: Daniel Mack <daniel at caiaq.de>
> 
> This would have crashed when unloading the module.
> ---
>  src/modules/coreaudio/module-coreaudio-detect.c |    5 +----
>  1 files changed, 1 insertions(+), 4 deletions(-)
> 
> diff --git a/src/modules/coreaudio/module-coreaudio-detect.c b/src/modules/coreaudio/module-coreaudio-detect.c
> index 1d26b84..fda1f17 100644
> --- a/src/modules/coreaudio/module-coreaudio-detect.c
> +++ b/src/modules/coreaudio/module-coreaudio-detect.c
> @@ -231,13 +231,10 @@ fail:
>  }
>  
>  void pa__done(pa_module *m) {
> -    struct userdata *u;
> +    struct userdata *u = m->userdata;
>      struct ca_device *dev = u->devices;
>      AudioObjectPropertyAddress property_address;
>  
> -    pa_assert(m);
> -    pa_assert_se(u = m->userdata);
> -
>      property_address.mSelector = kAudioHardwarePropertyDevices;
>      property_address.mScope = kAudioObjectPropertyScopeGlobal;
>      property_address.mElement = kAudioObjectPropertyElementMaster;

>From what I can see, most modules are still calling pa_assert(m) so it's
probably better to keep the assert in there and just move the dev =
u->devices line lower.

Other than that the other patches are all fine.

Col

-- 

Colin Guthrie
gmane(at)colin.guthr.ie
http://colin.guthr.ie/

Day Job:
  Tribalogic Limited [http://www.tribalogic.net/]
Open Source:
  Mageia Contributor [http://www.mageia.org/]
  PulseAudio Hacker [http://www.pulseaudio.org/]
  Trac Hacker [http://trac.edgewall.org/]