| Message ID | 1442229154-2052-1-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Mon, Sep 14, 2015 at 01:12:34PM +0200, Paolo Bonzini wrote: > The "err" label cannot be reached with qp != NULL. Remove the free-ing > of qp and avoid future regressions by removing the initializer. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > block/ssh.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/block/ssh.c b/block/ssh.c > index 8d06739..d35b51f 100644 > --- a/block/ssh.c > +++ b/block/ssh.c > @@ -193,7 +193,7 @@ sftp_error_report(BDRVSSHState *s, const char *fs, ...) > static int parse_uri(const char *filename, QDict *options, Error **errp) > { > URI *uri = NULL; > - QueryParams *qp = NULL; > + QueryParams *qp; > int i; > > uri = uri_parse(filename); > @@ -249,9 +249,6 @@ static int parse_uri(const char *filename, QDict *options, Error **errp) > return 0; > > err: > - if (qp) { > - query_params_free(qp); > - } > if (uri) { > uri_free(uri); > } The patch looks correct to me, so: ACK However (in libguestfs) we would generally leave such code around to make it more future proof against rearrangements of the code which could cause a memory leak. But then again, libguestfs (following systemd practice) uses __attribute__((cleanup)) extensively ... Rich.
On Mon, 09/14 13:12, Paolo Bonzini wrote: > The "err" label cannot be reached with qp != NULL. Remove the free-ing > of qp and avoid future regressions by removing the initializer. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > block/ssh.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/block/ssh.c b/block/ssh.c > index 8d06739..d35b51f 100644 > --- a/block/ssh.c > +++ b/block/ssh.c > @@ -193,7 +193,7 @@ sftp_error_report(BDRVSSHState *s, const char *fs, ...) > static int parse_uri(const char *filename, QDict *options, Error **errp) > { > URI *uri = NULL; > - QueryParams *qp = NULL; > + QueryParams *qp; > int i; > > uri = uri_parse(filename); > @@ -249,9 +249,6 @@ static int parse_uri(const char *filename, QDict *options, Error **errp) > return 0; > > err: > - if (qp) { > - query_params_free(qp); > - } > if (uri) { > uri_free(uri); > } > -- > 2.5.0 > > Reviewed-by: Fam Zheng <famz@redhat.com>
14.09.2015 14:12, Paolo Bonzini wrote: > The "err" label cannot be reached with qp != NULL. Remove the free-ing > of qp and avoid future regressions by removing the initializer. Applied to -trivial, thank you! /mjt
diff --git a/block/ssh.c b/block/ssh.c index 8d06739..d35b51f 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -193,7 +193,7 @@ sftp_error_report(BDRVSSHState *s, const char *fs, ...) static int parse_uri(const char *filename, QDict *options, Error **errp) { URI *uri = NULL; - QueryParams *qp = NULL; + QueryParams *qp; int i; uri = uri_parse(filename); @@ -249,9 +249,6 @@ static int parse_uri(const char *filename, QDict *options, Error **errp) return 0; err: - if (qp) { - query_params_free(qp); - } if (uri) { uri_free(uri); }
The "err" label cannot be reached with qp != NULL. Remove the free-ing of qp and avoid future regressions by removing the initializer. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- block/ssh.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)