[pulseaudio-discuss] [PATCH 2/3] bluetooth: Don't free modargs twice

[Arun Raghavan]

On Tue, 16 Aug 2016, at 11:17 AM, Peter Meerwald-Stadler wrote:
> CID1353139
> 
> Signed-off-by: Peter Meerwald-Stadler <pmeerw at pmeerw.net>
> ---
>  src/modules/bluetooth/module-bluez5-device.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/src/modules/bluetooth/module-bluez5-device.c
> b/src/modules/bluetooth/module-bluez5-device.c
> index e610095..edfd8c7 100644
> --- a/src/modules/bluetooth/module-bluez5-device.c
> +++ b/src/modules/bluetooth/module-bluez5-device.c
> @@ -2198,12 +2198,11 @@ int pa__init(pa_module* m) {
>      u->transport_microphone_gain_changed_slot =
>          pa_hook_connect(pa_bluetooth_discovery_hook(u->discovery,
>          PA_BLUETOOTH_HOOK_TRANSPORT_MICROPHONE_GAIN_CHANGED),
>          PA_HOOK_NORMAL, (pa_hook_cb_t)
>          transport_microphone_gain_changed_cb, u);
>  
> -
>      if (add_card(u) < 0)
> -        goto fail;
> +        goto fail2;
>  
>      if (!(u->msg = pa_msgobject_new(bluetooth_msg)))
> -        goto fail;
> +        goto fail2;
>  
>      u->msg->parent.process_msg = device_process_msg;
>      u->msg->card = u->card;
> @@ -2230,6 +2229,8 @@ fail:
>      if (ma)
>          pa_modargs_free(ma);
>  
> +fail2:
> +
>      pa__done(m);
>  
>      return -1;
> -- 

I'm not a fan of non-descriptive labels. Either rename to
fail_free_modargs and fail, or just set ma to NULL after freeing it. I'm
fine with either, so just fix it up and push.

-- Arun