Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Imgtool: Proper cleanup of floppy object after create/open failure

Browse Source
This commit is contained in:
Nathan Woods 2017-07-22 20:00:56 -04:00
parent 474f7ffd04
commit a2a3d6b90b
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/imgtool/iflopimg.cpp
View File

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