[PATCH v2 1/2] bluetooth: Reorganize code to avoid Coverity NULL dereference warning

[tanuk@xxxxxx (Tanu Kaskinen)]

On Wed, 2016-08-17 at 14:48 +0200, Peter Meerwald-Stadler wrote:
> > From: Peter Meerwald <p.meerwald at bct-electronic.com>
> 
> CID 1353122
> 
> > Signed-off-by: Peter Meerwald-Stadler <pmeerw at pmeerw.net>
> 
> ---
> v2: wording as suggested by Tanu, thanks!
> ---
> Â src/modules/bluetooth/bluez4-util.c | 10 +++++-----
> Â 1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/src/modules/bluetooth/bluez4-util.c b/src/modules/bluetooth/bluez4-util.c
> index 3793898..542ce35 100644
> --- a/src/modules/bluetooth/bluez4-util.c
> +++ b/src/modules/bluetooth/bluez4-util.c
> @@ -657,13 +657,13 @@ static void get_properties_reply(DBusPendingCall *pending, void *userdata) {
> Â 
> Â Â Â Â Â pa_assert(p->call_data == d);
> Â 
> -Â Â Â Â if (d != NULL)
> +Â Â Â Â if (d != NULL) {
> Â Â Â Â Â Â Â Â Â old_any_connected = pa_bluez4_device_any_audio_connected(d);
> +Â Â Â Â Â Â Â Â valid = dbus_message_get_type(r) == DBUS_MESSAGE_TYPE_ERROR ? -1 : 1;
> Â 
> -Â Â Â Â valid = dbus_message_get_type(r) == DBUS_MESSAGE_TYPE_ERROR ? -1 : 1;
> -
> -Â Â Â Â if (dbus_message_is_method_call(p->message, "org.bluez.Device", "GetProperties"))
> -Â Â Â Â Â Â Â Â d->device_info_valid = valid;
> +Â Â Â Â Â Â Â Â if (dbus_message_is_method_call(p->message, "org.bluez.Device", "GetProperties"))
> +Â Â Â Â Â Â Â Â Â Â Â Â d->device_info_valid = valid;
> +Â Â Â Â }
> Â 
> Â Â Â Â Â if (dbus_message_is_error(r, DBUS_ERROR_SERVICE_UNKNOWN)) {
> Â Â Â Â Â Â Â Â Â pa_log_debug("Bluetooth daemon is apparently not available.");

Looks good to me.

--Â 
Tanu