Re: [libvirt] [PATCH glib] gobject-stream: fix issue found by coverity

On 20.2.2014 15:07, Christophe Fergeau wrote: >>@@ -102,17 +102,33 @@ static GOutputStream* gvir_stream_get_output_stream(GIOStream *io_stream) >> >> static gboolean gvir_stream_close(GIOStream *io_stream, >> GCancellable *cancellable, >>- G_GNUC_UNUSED GError **error) >>+ GError **error) >> { >> GVirStream *self = GVIR_STREAM(io_stream); >>+ GError *local_error = NULL; >>+ gboolean i_ret = TRUE, o_ret = TRUE; >> >> if (self->priv->input_stream) >>- g_input_stream_close(self->priv->input_stream, cancellable, NULL); >>+ i_ret = g_input_stream_close(self->priv->input_stream, cancellable, &local_error); >>+ >>+ if (local_error) { >>+ if (!*error) >>+ g_propagate_error(error, local_error); >>+ else >>+ g_error_free(local_error); >>+ } > >g_propagate_error will be doing this if (!*error) check for you, so this >can be written as >if (local_error) > g_propagate_error(error, local_error); > > > >void g_propagate_error (GError **dest, > GError *src); >If dest is NULL, free src; otherwise, moves src into *dest. > > >Christophe > The g_propagate_error will free the src only if error == NULL but if the *error is not NULL it will print warning and do nothing with the src and therefore there could be memory leak. That's why I'm checking if *error is null and otherwise I'll free the local_error.