Received-SPF: pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 3 Jul 2019 19:24:16 +0200
From:   =?utf-8?Q?Micha=C5=82?= Lowas-Rzechonek 
        <michal.lowas-rzechonek@silvair.com>
To:     Brian Gix <brian.gix@intel.com>
Cc:     linux-bluetooth@vger.kernel.org, inga.stotland@intel.com
Subject: Re: [PATCH BlueZ] mesh: Fix memory leak on dbus message creation
Message-ID: <20190703172416.thky44wklorfz7zz@kynes>
Mail-Followup-To: Brian Gix <brian.gix@intel.com>,
        linux-bluetooth@vger.kernel.org, inga.stotland@intel.com
References: <20190703163403.15814-1-brian.gix@intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <20190703163403.15814-1-brian.gix@intel.com>
User-Agent: NeoMutt/20180716
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk

Hi,

On 07/03, Brian Gix wrote:
> ---
>  mesh/model.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/mesh/model.c b/mesh/model.c
> index 7401dcecb..a2b3e5c18 100644
> --- a/mesh/model.c
> +++ b/mesh/model.c
> @@ -729,10 +729,13 @@ static void send_msg_rcvd(struct mesh_node *node, uint8_t ele_idx, bool is_sub,
>  	if (!l_dbus_message_builder_finalize(builder))
>  		goto error;
>  
> +	l_dbus_message_builder_destroy(builder);
>  	l_dbus_send(dbus, msg);
> +	return;
>  
>  error:
>  	l_dbus_message_builder_destroy(builder);
> +	l_dbus_message_unref(msg);
>  }
>  
>  bool mesh_model_rx(struct mesh_node *node, bool szmict, uint32_t seq0,

Since in ELL's dbus API it's legal to unref a NULL message, I'd rather
write this as:

    l_dbus_send(dbus, msg);
    msg = NULL;

error:
    l_dbus_message_builder_destroy(builder);
    l_dbus_message_unref(msg);


or (version for purists):

    l_dbus_send(dbus, msg);
    msg = NULL;

error:
    l_dbus_message_builder_destroy(builder);
    if (msg)
        l_dbus_message_unref(msg);


mostly to emphasize that l_dbus_send has "move" semantics.

-- 
Michał Lowas-Rzechonek <michal.lowas-rzechonek@silvair.com>
Silvair http://silvair.com
Jasnogórska 44, 31-358 Krakow, POLAND