|
 |
f72740 |
From 1b025f7c670eeafb835858558db356917e150a36 Mon Sep 17 00:00:00 2001
|
|
|
f72740 |
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
|
|
f72740 |
Date: Mon, 6 Aug 2018 16:59:37 +0100
|
|
|
f72740 |
Subject: [PATCH] Add missing free'ing of virTypedParameters
|
|
|
f72740 |
MIME-Version: 1.0
|
|
|
f72740 |
Content-Type: text/plain; charset=UTF-8
|
|
|
f72740 |
Content-Transfer-Encoding: 8bit
|
|
|
f72740 |
|
|
|
f72740 |
Safefree() must be used to free any virTypedParameter arrays previously
|
|
|
f72740 |
allocated with Newx().
|
|
|
f72740 |
|
|
|
f72740 |
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
f72740 |
(cherry picked from commit 440fde1cb81595c9f5eab7b03c240ca88e998961)
|
|
|
f72740 |
---
|
|
|
f72740 |
lib/Sys/Virt.xs | 36 +++++++++++++++++++++++++++---------
|
|
|
f72740 |
1 file changed, 27 insertions(+), 9 deletions(-)
|
|
|
f72740 |
|
|
|
f72740 |
diff --git a/lib/Sys/Virt.xs b/lib/Sys/Virt.xs
|
|
|
f72740 |
index a013915..3d8eb9b 100644
|
|
|
f72740 |
--- a/lib/Sys/Virt.xs
|
|
|
f72740 |
+++ b/lib/Sys/Virt.xs
|
|
|
f72740 |
@@ -2683,8 +2683,10 @@ set_node_memory_parameters(conn, newparams, flags=0)
|
|
|
f72740 |
|
|
|
f72740 |
nparams = vir_typed_param_from_hv(newparams, params, nparams);
|
|
|
f72740 |
|
|
|
f72740 |
- if (virNodeSetMemoryParameters(conn, params, nparams, flags) < 0)
|
|
|
f72740 |
+ if (virNodeSetMemoryParameters(conn, params, nparams, flags) < 0) {
|
|
|
f72740 |
+ Safefree(params);
|
|
|
f72740 |
_croak_error();
|
|
|
f72740 |
+ }
|
|
|
f72740 |
Safefree(params);
|
|
|
f72740 |
|
|
|
f72740 |
|
|
|
f72740 |
@@ -4566,7 +4568,7 @@ get_job_stats(dom, flags=0)
|
|
|
f72740 |
|
|
|
f72740 |
typeSv = newSViv(type);
|
|
|
f72740 |
paramsHv = vir_typed_param_to_hv(params, nparams);
|
|
|
f72740 |
- Safefree(params);
|
|
|
f72740 |
+ free(params);
|
|
|
f72740 |
|
|
|
f72740 |
EXTEND(SP, 2);
|
|
|
f72740 |
PUSHs(newRV_noinc((SV*)typeSv));
|
|
|
f72740 |
@@ -4775,11 +4777,15 @@ set_scheduler_parameters(dom, newparams, flags=0)
|
|
|
f72740 |
}
|
|
|
f72740 |
nparams = vir_typed_param_from_hv(newparams, params, nparams);
|
|
|
f72740 |
if (flags) {
|
|
|
f72740 |
- if (virDomainSetSchedulerParametersFlags(dom, params, nparams, flags) < 0)
|
|
|
f72740 |
+ if (virDomainSetSchedulerParametersFlags(dom, params, nparams, flags) < 0) {
|
|
|
f72740 |
+ Safefree(params);
|
|
|
f72740 |
_croak_error();
|
|
|
f72740 |
+ }
|
|
|
f72740 |
} else {
|
|
|
f72740 |
- if (virDomainSetSchedulerParameters(dom, params, nparams) < 0)
|
|
|
f72740 |
+ if (virDomainSetSchedulerParameters(dom, params, nparams) < 0) {
|
|
|
f72740 |
+ Safefree(params);
|
|
|
f72740 |
_croak_error();
|
|
|
f72740 |
+ }
|
|
|
f72740 |
}
|
|
|
f72740 |
Safefree(params);
|
|
|
f72740 |
|
|
|
f72740 |
@@ -4831,8 +4837,10 @@ set_memory_parameters(dom, newparams, flags=0)
|
|
|
f72740 |
|
|
|
f72740 |
nparams = vir_typed_param_from_hv(newparams, params, nparams);
|
|
|
f72740 |
|
|
|
f72740 |
- if (virDomainSetMemoryParameters(dom, params, nparams, flags) < 0)
|
|
|
f72740 |
+ if (virDomainSetMemoryParameters(dom, params, nparams, flags) < 0) {
|
|
|
f72740 |
+ Safefree(params);
|
|
|
f72740 |
_croak_error();
|
|
|
f72740 |
+ }
|
|
|
f72740 |
Safefree(params);
|
|
|
f72740 |
|
|
|
f72740 |
|
|
|
f72740 |
@@ -4883,8 +4891,10 @@ set_numa_parameters(dom, newparams, flags=0)
|
|
|
f72740 |
|
|
|
f72740 |
nparams = vir_typed_param_from_hv(newparams, params, nparams);
|
|
|
f72740 |
|
|
|
f72740 |
- if (virDomainSetNumaParameters(dom, params, nparams, flags) < 0)
|
|
|
f72740 |
+ if (virDomainSetNumaParameters(dom, params, nparams, flags) < 0) {
|
|
|
f72740 |
+ Safefree(params);
|
|
|
f72740 |
_croak_error();
|
|
|
f72740 |
+ }
|
|
|
f72740 |
Safefree(params);
|
|
|
f72740 |
|
|
|
f72740 |
|
|
|
f72740 |
@@ -4936,8 +4946,10 @@ set_blkio_parameters(dom, newparams, flags=0)
|
|
|
f72740 |
nparams = vir_typed_param_from_hv(newparams, params, nparams);
|
|
|
f72740 |
|
|
|
f72740 |
if (virDomainSetBlkioParameters(dom, params, nparams,
|
|
|
f72740 |
- flags) < 0)
|
|
|
f72740 |
+ flags) < 0) {
|
|
|
f72740 |
+ Safefree(params);
|
|
|
f72740 |
_croak_error();
|
|
|
f72740 |
+ }
|
|
|
f72740 |
Safefree(params);
|
|
|
f72740 |
|
|
|
f72740 |
|
|
|
f72740 |
@@ -5658,8 +5670,11 @@ set_block_iotune(dom, disk, newparams, flags=0)
|
|
|
f72740 |
}
|
|
|
f72740 |
|
|
|
f72740 |
nparams = vir_typed_param_from_hv(newparams, params, nparams);
|
|
|
f72740 |
- if (virDomainSetBlockIoTune(dom, disk, params, nparams, flags) < 0)
|
|
|
f72740 |
+ if (virDomainSetBlockIoTune(dom, disk, params, nparams, flags) < 0) {
|
|
|
f72740 |
+ Safefree(params);
|
|
|
f72740 |
_croak_error();
|
|
|
f72740 |
+ }
|
|
|
f72740 |
+ Safefree(params);
|
|
|
f72740 |
|
|
|
f72740 |
|
|
|
f72740 |
HV *
|
|
|
f72740 |
@@ -5709,8 +5724,11 @@ set_interface_parameters(dom, intf, newparams, flags=0)
|
|
|
f72740 |
}
|
|
|
f72740 |
|
|
|
f72740 |
nparams = vir_typed_param_from_hv(newparams, params, nparams);
|
|
|
f72740 |
- if (virDomainSetInterfaceParameters(dom, intf, params, nparams, flags) < 0)
|
|
|
f72740 |
+ if (virDomainSetInterfaceParameters(dom, intf, params, nparams, flags) < 0) {
|
|
|
f72740 |
+ Safefree(params);
|
|
|
f72740 |
_croak_error();
|
|
|
f72740 |
+ }
|
|
|
f72740 |
+ Safefree(params);
|
|
|
f72740 |
|
|
|
f72740 |
|
|
|
f72740 |
HV *
|