External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-24 05:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: blockCopy: Add missing jump on error path

Browse Source 
The overflow check for the bandwidth parameter did not jump to the
cleanup label.

Additionally virsh should use vshError instead of virReportError.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1206987

Signed-off-by: Luyao Huang <lhuang@redhat.com>
This commit is contained in:
Luyao Huang 2015-03-27 17:56:29 +08:00 committed by Peter Krempa
parent 53eae3e7c3
commit 390f218b83
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/virsh-domain.c
View File

@ -2253,9 +2253,8 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd)
* ullong bytes/s; make sure we don't overflow */ * ullong bytes/s; make sure we don't overflow */
unsigned long long limit = MIN(ULONG_MAX, ULLONG_MAX >> 20); unsigned long long limit = MIN(ULONG_MAX, ULLONG_MAX >> 20);
if (bandwidth > limit) { if (bandwidth > limit) {
virReportError(VIR_ERR_OVERFLOW, vshError(ctl, _("bandwidth must be less than %llu"), limit);
_("bandwidth must be less than %llu"), goto cleanup;
ULLONG_MAX >> 20);
} }
if (virTypedParameterAssign(&params[nparams++], if (virTypedParameterAssign(&params[nparams++],
VIR_DOMAIN_BLOCK_COPY_BANDWIDTH, VIR_DOMAIN_BLOCK_COPY_BANDWIDTH,