VARCem/MiniVHD
1
0
Fork 0
mirror of https://github.com/VARCem/MiniVHD.git synced 2026-07-09 02:26:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor error detection fixes during creation

Browse Source
This commit is contained in:
shermp
2020-11-14 13:57:55 +13:00
parent dadd2432f9
commit e1c3ec5f87
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/minivhd_create.c
View File

@@ -187,11 +187,7 @@ MVHDMeta* mvhd_create_fixed_raw(const char* path, FILE* raw_img, uint64_t size_i
*err = MVHD_ERR_MEM;
goto end;
}
if (raw_img == NULL && geom == NULL) {
*err = MVHD_ERR_INVALID_GEOM;
goto cleanup_vhdm;
}
if (geom != NULL && (geom->cyl == 0 || geom->heads == 0 || geom->spt == 0)) {
if (geom == NULL || (geom->cyl == 0 || geom->heads == 0 || geom->spt == 0)) {
*err = MVHD_ERR_INVALID_GEOM;
goto cleanup_vhdm;
}
@@ -284,13 +280,10 @@ static MVHDMeta* mvhd_create_sparse_diff(const char* path, const char* par_path,
par_geom.spt = par_vhdm->footer.geom.spt;
geom = &par_geom;
size_in_bytes = par_vhdm->footer.curr_sz;
} else if (geom != NULL && (geom->cyl == 0 || geom->heads == 0 || geom->spt == 0)) {
} else if (geom == NULL || (geom->cyl == 0 || geom->heads == 0 || geom->spt == 0)) {
*err = MVHD_ERR_INVALID_GEOM;
goto cleanup_vhdm;
} else if (geom == NULL) {
*err = MVHD_ERR_INVALID_GEOM;
goto cleanup_vhdm;
}
}
FILE* f = mvhd_fopen(path, "wb+", err);
if (f == NULL) {