External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

rpc: Fix memory leak in remoteDomainSet*Parameters functions

Browse Source 
Add a new helper remoteFreeTypedParameters and teach the generator
to add it to the cleanup section.

https://bugzilla.redhat.com/show_bug.cgi?id=725322
This commit is contained in:
Matthias Bolte 2011-07-27 20:32:25 +02:00
parent 4ab0260956
commit 8d2319cb90
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/remote/remote_driver.c
View File

@ -1208,6 +1208,22 @@ done:
return rv; return rv;
} }
/* Helper to free typed parameters. */
static void
remoteFreeTypedParameters(remote_typed_param *args_params_val,
u_int args_params_len)
{
u_int i;
if (args_params_val == NULL)
return;
for (i = 0; i < args_params_len; i++)
VIR_FREE(args_params_val[i].field);
VIR_FREE(args_params_val);
}
/* Helper to serialize typed parameters. */ /* Helper to serialize typed parameters. */
static int static int
remoteSerializeTypedParameters(virTypedParameterPtr params, remoteSerializeTypedParameters(virTypedParameterPtr params,
@ -1264,11 +1280,7 @@ remoteSerializeTypedParameters(virTypedParameterPtr params,
rv = 0; rv = 0;
cleanup: cleanup:
if (val) { remoteFreeTypedParameters(val, nparams);
for (i = 0; i < nparams; i++)
VIR_FREE(val[i].field);
VIR_FREE(val);
}
return rv; return rv;
} }

5
src/rpc/gendispatch.pl
View File

@ -979,6 +979,7 @@ elsif ($opt_k) {
my @args_check_list = (); my @args_check_list = ();
my @setters_list = (); my @setters_list = ();
my @setters_list2 = (); my @setters_list2 = ();
my @free_list = ();
my $priv_src = "conn"; my $priv_src = "conn";
my $priv_name = "privateData"; my $priv_name = "privateData";
my $call_args = "&args"; my $call_args = "&args";
@ -1105,6 +1106,7 @@ elsif ($opt_k) {
" xdr_free((xdrproc_t)xdr_$call->{args}, (char *)&args);\n" . " xdr_free((xdrproc_t)xdr_$call->{args}, (char *)&args);\n" .
" goto done;\n" . " goto done;\n" .
" }"); " }");
push(@free_list, " remoteFreeTypedParameters(args.params.params_val, args.params.params_len);\n");
} elsif ($args_member =~ m/^((?:unsigned )?int) (\S+);\s*\/\*\s*call-by-reference\s*\*\//) { } elsif ($args_member =~ m/^((?:unsigned )?int) (\S+);\s*\/\*\s*call-by-reference\s*\*\//) {
my $type_name = "$1 *"; my $type_name = "$1 *";
my $arg_name = $2; my $arg_name = $2;
@ -1500,6 +1502,9 @@ elsif ($opt_k) {
print "\n"; print "\n";
print "done:\n"; print "done:\n";
print join("\n", @free_list);
print " remoteDriverUnlock(priv);\n"; print " remoteDriverUnlock(priv);\n";
print " return rv;\n"; print " return rv;\n";
print "}\n"; print "}\n";