OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

util/uri: do not check argument of uri_free() 

uri_free() checks if its argument is NULL in uri_clean() and g_free().
There is no need to check the argument before the call.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Message-Id: <20210629063602.4239-1-xypron.glpk@gmx.de>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Heinrich Schuchardt 2021-06-29 08:36:02 +02:00 committed by Kevin Wolf
parent eb06cbab7e
commit c2615bdfbd
3 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
block/nfs.c
View File

@ -147,9 +147,7 @@ out:
if (qp) {
query_params_free(qp);
}
if (uri) {
uri_free(uri);
}
uri_free(uri);
return ret;
}

4
block/ssh.c
View File

@ -237,9 +237,7 @@ static int parse_uri(const char *filename, QDict *options, Error **errp)
return 0;
err:
if (uri) {
uri_free(uri);
}
uri_free(uri);
return -EINVAL;
}

22
util/uri.c
View File

@ -1340,7 +1340,7 @@ static void uri_clean(URI *uri)
/**
* uri_free:
* @uri: pointer to an URI
* @uri: pointer to an URI, NULL is ignored
*
* Free up the URI struct
*/
@ -1939,15 +1939,9 @@ step_7:
val = uri_to_string(res);
done:
if (ref != NULL) {
uri_free(ref);
}
if (bas != NULL) {
uri_free(bas);
}
if (res != NULL) {
uri_free(res);
}
uri_free(ref);
uri_free(bas);
uri_free(res);
return val;
}
@ -2190,12 +2184,8 @@ done:
if (remove_path != 0) {
ref->path = NULL;
}
if (ref != NULL) {
uri_free(ref);
}
if (bas != NULL) {
uri_free(bas);
}
uri_free(ref);
uri_free(bas);
return val;
}