« Previous | Next » 

Revision 36452f12

ID36452f12f877c60f004b34641287d74b14c96208

Added by Fam Zheng over 10 years ago

qemu-img: Fix overwriting 'ret' before using

This patch moves ret assignment after reporting original error.

We were lucky to pass qemu-iotests 048 (qemu-img compare case) but when
I tried to run with TEST_DIR=/tmp (tmpfs), it fails with a "wrong"
mismatch offset. This fixes two bugs.

In the first if branch, setting ret to 1 before using it makes dead code
in the next line: pnum is never added to mismatch offset even if ret was
0.

In the other if branch, currently the output error is always -4:
strerror(-4) -> Unknown error -4

Added regression test in case 048.

Signed-off-by: Fam Zheng <>
Signed-off-by: Amos Kong <>
Signed-off-by: Kevin Wolf <>
Reviewed-by: Eric Blake <>
Reviewed-by: Fam Zheng <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted

View differences