Merge pull request #2516 from npwoods/imgtool_fix_filelock_on_error

Imgtool: Proper cleanup of floppy object after create/open failure
This commit is contained in:
ajrhacker 2017-07-24 11:52:25 -04:00 committed by GitHub
commit a9083f3af8

View File

@ -140,6 +140,11 @@ static imgtoolerr_t imgtool_floppy_open_internal(imgtool::image &image, imgtool:
done:
if (f)
delete f;
if (err && fimg->floppy)
{
floppy_close(fimg->floppy);
fimg->floppy = nullptr;
}
return err;
}
@ -200,6 +205,11 @@ static imgtoolerr_t imgtool_floppy_create(imgtool::image &image, imgtool::stream
done:
if (f)
delete f;
if (err && fimg->floppy)
{
floppy_close(fimg->floppy);
fimg->floppy = nullptr;
}
return err;
}